From fd3eb78710e902a9c7d48af069cde0b03bba26bc Mon Sep 17 00:00:00 2001
From: Dave Kover <kover@cyngn.com>
Date: Fri, 8 Jan 2016 17:06:51 -0800
Subject: [PATCH] Break out status bar icon from extdesk icon.

Create a separate resource for the dashboard category icon for
Status Bar. Rename the extended desktop icons so they are further
distinguished from the dashboard iconography.

The goal is makea sure only dashboard icons are using the
ic_settings_ prefix and rename iconography that is not part of
that view.

Ticket: CYNGNOS-1681
Change-Id: I54165bd4338bb1d73f1d453f75ee1c06cfd62a8f
---
 ...xtdesk_hideboth.xml => ic_extdesk_hideboth.xml} |  0
 ...sk_hidenavbar.xml => ic_extdesk_hidenavbar.xml} |  0
 ...xtdesk_hidenone.xml => ic_extdesk_hidenone.xml} |  0
 ...estatusbar.xml => ic_extdesk_hidestatusbar.xml} |  0
 res/drawable/ic_settings_statusbar.xml             | 27 ++++++++++++++++++++++
 res/layout/expanded_item.xml                       |  2 +-
 res/xml/dashboard_categories.xml                   |  2 +-
 .../ExpandedDesktopPreferenceFragment.java         |  8 +++----
 8 files changed, 33 insertions(+), 6 deletions(-)
 rename res/drawable/{ic_settings_extdesk_hideboth.xml => ic_extdesk_hideboth.xml} (100%)
 rename res/drawable/{ic_settings_extdesk_hidenavbar.xml => ic_extdesk_hidenavbar.xml} (100%)
 rename res/drawable/{ic_settings_extdesk_hidenone.xml => ic_extdesk_hidenone.xml} (100%)
 rename res/drawable/{ic_settings_extdesk_hidestatusbar.xml => ic_extdesk_hidestatusbar.xml} (100%)
 create mode 100644 res/drawable/ic_settings_statusbar.xml

diff --git a/res/drawable/ic_settings_extdesk_hideboth.xml b/res/drawable/ic_extdesk_hideboth.xml
similarity index 100%
rename from res/drawable/ic_settings_extdesk_hideboth.xml
rename to res/drawable/ic_extdesk_hideboth.xml
diff --git a/res/drawable/ic_settings_extdesk_hidenavbar.xml b/res/drawable/ic_extdesk_hidenavbar.xml
similarity index 100%
rename from res/drawable/ic_settings_extdesk_hidenavbar.xml
rename to res/drawable/ic_extdesk_hidenavbar.xml
diff --git a/res/drawable/ic_settings_extdesk_hidenone.xml b/res/drawable/ic_extdesk_hidenone.xml
similarity index 100%
rename from res/drawable/ic_settings_extdesk_hidenone.xml
rename to res/drawable/ic_extdesk_hidenone.xml
diff --git a/res/drawable/ic_settings_extdesk_hidestatusbar.xml b/res/drawable/ic_extdesk_hidestatusbar.xml
similarity index 100%
rename from res/drawable/ic_settings_extdesk_hidestatusbar.xml
rename to res/drawable/ic_extdesk_hidestatusbar.xml
diff --git a/res/drawable/ic_settings_statusbar.xml b/res/drawable/ic_settings_statusbar.xml
new file mode 100644
index 0000000000..cfd04a4a2e
--- /dev/null
+++ b/res/drawable/ic_settings_statusbar.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M18,20H6V8h12V20Z
+M18,2H6C4.9,2,4,2.9,4,4v16c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V4C20,2.9,19.1,2,18,2L18,2z" />
+</vector>
diff --git a/res/layout/expanded_item.xml b/res/layout/expanded_item.xml
index 8098662d25..042d3eff57 100755
--- a/res/layout/expanded_item.xml
+++ b/res/layout/expanded_item.xml
@@ -68,5 +68,5 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:scaleType="centerInside"
-        android:src="@drawable/ic_settings_extdesk_hidenone" />
+        android:src="@drawable/ic_extdesk_hidenone" />
 </LinearLayout>
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index eee8645e88..acf6874f29 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -234,7 +234,7 @@
                 android:id="@+id/status_bar_settings"
                 android:title="@string/status_bar_title"
                 android:fragment="com.android.settings.cyanogenmod.StatusBarSettings"
-                android:icon="@drawable/ic_settings_extdesk_hidenavbar"
+                android:icon="@drawable/ic_settings_statusbar"
                 />
 
         <!-- Application Settings -->
diff --git a/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java b/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
index 80afb023bc..af8bf10a5b 100644
--- a/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
+++ b/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
@@ -348,14 +348,14 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
     int getStateDrawable(int state) {
         switch (state) {
             case STATE_STATUS_HIDDEN:
-                return R.drawable.ic_settings_extdesk_hidestatusbar;
+                return R.drawable.ic_extdesk_hidestatusbar;
             case STATE_NAVIGATION_HIDDEN:
-                return R.drawable.ic_settings_extdesk_hidenavbar;
+                return R.drawable.ic_extdesk_hidenavbar;
             case STATE_BOTH_HIDDEN:
-                return R.drawable.ic_settings_extdesk_hideboth;
+                return R.drawable.ic_extdesk_hideboth;
             case STATE_DISABLED:
             default:
-                return R.drawable.ic_settings_extdesk_hidenone;
+                return R.drawable.ic_extdesk_hidenone;
         }
     }
 
-- 
2.11.0