Merge branch 'master' of https://gitlab.com/relan/fdroidclient

F-Droid/res/menu/main.xml

@@ -18,7 +18,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_manage_repos"
-        android:icon="@drawable/ic_view_headline_white"
+        android:icon="@drawable/ic_toc_white"
         android:title="@string/menu_manage"
         app:showAsAction="ifRoom"/>
     <item
@@ -37,4 +37,4 @@
         android:title="@string/menu_about"
         app:showAsAction="ifRoom"/>
 
-</menu>
+</menu>

F-Droid/src/org/fdroid/fdroid/FDroid.java

@@ -309,7 +309,6 @@ public class FDroid extends ActionBarActivity {
                         ).setView(view);
             }
             final AlertDialog alrt = builder.create();
-            alrt.setIcon(R.drawable.ic_launcher);
             alrt.setTitle(getString(R.string.about_title));
             alrt.setButton(AlertDialog.BUTTON_NEUTRAL,
                     getString(R.string.about_website),
@@ -342,7 +341,6 @@ public class FDroid extends ActionBarActivity {
             if (data != null && data.hasExtra(ManageReposActivity.REQUEST_UPDATE)) {
                 AlertDialog.Builder ask_alrt = new AlertDialog.Builder(this);
                 ask_alrt.setTitle(getString(R.string.repo_update_title));
-                ask_alrt.setIcon(android.R.drawable.ic_menu_rotate);
                 ask_alrt.setMessage(getString(R.string.repo_alrt));
                 ask_alrt.setPositiveButton(getString(R.string.yes),
                         new DialogInterface.OnClickListener() {

F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java

@@ -348,9 +348,7 @@ public class ManageReposActivity extends ActionBarActivity {
             final EditText uriEditText = (EditText) view.findViewById(R.id.edit_uri);
             final EditText fingerprintEditText = (EditText) view.findViewById(R.id.edit_fingerprint);
 
-            addRepoDialog.setIcon(android.R.drawable.ic_menu_add);
             addRepoDialog.setTitle(getString(R.string.repo_add_title));
-
             addRepoDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
                 getString(R.string.cancel),
                 new DialogInterface.OnClickListener() {

F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java

@@ -138,7 +138,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
         mUpdateAllButton.setId(UPDATE_ALL_BUTTON_ID);
         mUpdateAllButton.setText(R.string.update_all);
         mUpdateAllButton.setCompoundDrawablesWithIntrinsicBounds(
-                getResources().getDrawable(R.drawable.ic_menu_refresh), null, null, null);
+                getResources().getDrawable(R.drawable.ic_refresh_white), null, null, null);
         mUpdateAllButton.setVisibility(View.GONE);
 
         linearLayout.addView(mUpdateAllButton, new FrameLayout.LayoutParams(

F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java

@@ -340,7 +340,6 @@ public class RepoDetailsFragment extends Fragment {
     private void promptForDelete() {
         new AlertDialog.Builder(getActivity())
             .setTitle(R.string.repo_confirm_delete_title)
-            .setIcon(android.R.drawable.ic_menu_delete)
             .setMessage(R.string.repo_confirm_delete_body)
             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                 @Override

F-Droid/tools/download-material-icon.sh

@@ -17,7 +17,7 @@ function usage {
 function download {
 	REMOTE_DRAWABLE_DIR=$1
 	LOCAL_DRAWABLE_DIR=$2
-	FILE="ic_${ICON}_48dp.png"
+	FILE="ic_${ICON}_24dp.png"
 	URL="$BASE_URL/$CATEGORY/$REMOTE_DRAWABLE_DIR/$FILE"
 	DIR="$RES_DIR/$LOCAL_DRAWABLE_DIR"