DeskClock: Show a setting icon instead of single item menu

Change-Id: I1917da96fc983e266a12509468bd4856287136a6

Author: luca020400

res/drawable/ic_settings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480Z" />
+
+</vector>

src/com/android/deskclock/DeskClock.java

@@ -159,7 +159,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         // Configure the menu item controllers add behavior to the toolbar.
-        mOptionsMenuManager.addMenuItemController(new SettingsMenuItemController(this));
+        mOptionsMenuManager.addMenuItemController(new SettingsMenuItemController(this, true));
 
         // Inflate the menu during creation to avoid a double layout pass. Otherwise, the menu
         // inflation occurs *after* the initial draw and a second layout pass adds in the menu.

src/com/android/deskclock/actionbarmenu/SettingsMenuItemController.java

@@ -36,9 +36,11 @@ public final class SettingsMenuItemController implements MenuItemController {
     private static final int SETTING_MENU_RES_ID = R.id.menu_item_settings;
 
     private final Activity mActivity;
+    private final boolean mShowIcon;
 
-    public SettingsMenuItemController(Activity activity) {
+    public SettingsMenuItemController(Activity activity, boolean showIcon) {
         mActivity = activity;
+        mShowIcon = showIcon;
     }
 
     @Override
@@ -48,8 +50,14 @@ public int getId() {
 
     @Override
     public void onCreateOptionsItem(Menu menu) {
-        menu.add(NONE, SETTING_MENU_RES_ID, NONE, R.string.menu_item_settings)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        if (mShowIcon) {
+            menu.add(NONE, SETTING_MENU_RES_ID, NONE, R.string.menu_item_settings)
+                    .setIcon(R.drawable.ic_settings)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        } else {
+            menu.add(NONE, SETTING_MENU_RES_ID, NONE, R.string.menu_item_settings)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        }
     }
 
     @Override

src/com/android/deskclock/worldclock/CitySelectionActivity.java

@@ -128,7 +128,7 @@ public boolean onQueryTextChange(String query) {
         mOptionsMenuManager.addMenuItemController(new NavUpMenuItemController(this))
                 .addMenuItemController(mSearchMenuItemController)
                 .addMenuItemController(new SortOrderMenuItemController())
-                .addMenuItemController(new SettingsMenuItemController(this));
+                .addMenuItemController(new SettingsMenuItemController(this, false));
         mCitiesList = findViewById(R.id.cities_list);
         mCitiesList.setAdapter(mCitiesAdapter);