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: 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
---
 res/drawable/ic_extdesk_hideboth.xml               | 27 ++++++++++++++++++++++
 res/drawable/ic_extdesk_hidenavbar.xml             | 27 ++++++++++++++++++++++
 res/drawable/ic_extdesk_hidenone.xml               | 27 ++++++++++++++++++++++
 res/drawable/ic_extdesk_hidestatusbar.xml          | 27 ++++++++++++++++++++++
 res/drawable/ic_settings_extdesk_hideboth.xml      | 27 ----------------------
 res/drawable/ic_settings_extdesk_hidenavbar.xml    | 27 ----------------------
 res/drawable/ic_settings_extdesk_hidenone.xml      | 27 ----------------------
 res/drawable/ic_settings_extdesk_hidestatusbar.xml | 27 ----------------------
 res/drawable/ic_settings_statusbar.xml             | 27 ++++++++++++++++++++++
 9 files changed, 135 insertions(+), 108 deletions(-)
 create mode 100644 res/drawable/ic_extdesk_hideboth.xml
 create mode 100644 res/drawable/ic_extdesk_hidenavbar.xml
 create mode 100644 res/drawable/ic_extdesk_hidenone.xml
 create mode 100644 res/drawable/ic_extdesk_hidestatusbar.xml
 delete mode 100644 res/drawable/ic_settings_extdesk_hideboth.xml
 delete mode 100644 res/drawable/ic_settings_extdesk_hidenavbar.xml
 delete mode 100644 res/drawable/ic_settings_extdesk_hidenone.xml
 delete mode 100644 res/drawable/ic_settings_extdesk_hidestatusbar.xml
 create mode 100644 res/drawable/ic_settings_statusbar.xml

(limited to 'res/drawable')

diff --git a/res/drawable/ic_extdesk_hideboth.xml b/res/drawable/ic_extdesk_hideboth.xml
new file mode 100644
index 0000000..46906cd
--- /dev/null
+++ b/res/drawable/ic_extdesk_hideboth.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,4v16H6V4H18
+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/drawable/ic_extdesk_hidenavbar.xml b/res/drawable/ic_extdesk_hidenavbar.xml
new file mode 100644
index 0000000..cfd04a4
--- /dev/null
+++ b/res/drawable/ic_extdesk_hidenavbar.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/drawable/ic_extdesk_hidenone.xml b/res/drawable/ic_extdesk_hidenone.xml
new file mode 100644
index 0000000..aab14a0
--- /dev/null
+++ b/res/drawable/ic_extdesk_hidenone.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="M6,8h12v8H6V8Z
+M6,22h12c1.1,0,2-0.9,2-2V4c0-1.1-0.9-2-2-2H6C4.9,2,4,2.9,4,4v16C4,21.1,4.9,22,6,22L6,22z" />
+</vector>
diff --git a/res/drawable/ic_extdesk_hidestatusbar.xml b/res/drawable/ic_extdesk_hidestatusbar.xml
new file mode 100644
index 0000000..22245dc
--- /dev/null
+++ b/res/drawable/ic_extdesk_hidestatusbar.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="M6,4h12v12H6V4Z
+M6,22h12c1.1,0,2-0.9,2-2V4c0-1.1-0.9-2-2-2H6C4.9,2,4,2.9,4,4v16C4,21.1,4.9,22,6,22L6,22z" />
+</vector>
diff --git a/res/drawable/ic_settings_extdesk_hideboth.xml b/res/drawable/ic_settings_extdesk_hideboth.xml
deleted file mode 100644
index 46906cd..0000000
--- a/res/drawable/ic_settings_extdesk_hideboth.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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,4v16H6V4H18
-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/drawable/ic_settings_extdesk_hidenavbar.xml b/res/drawable/ic_settings_extdesk_hidenavbar.xml
deleted file mode 100644
index cfd04a4..0000000
--- a/res/drawable/ic_settings_extdesk_hidenavbar.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/drawable/ic_settings_extdesk_hidenone.xml b/res/drawable/ic_settings_extdesk_hidenone.xml
deleted file mode 100644
index aab14a0..0000000
--- a/res/drawable/ic_settings_extdesk_hidenone.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="M6,8h12v8H6V8Z
-M6,22h12c1.1,0,2-0.9,2-2V4c0-1.1-0.9-2-2-2H6C4.9,2,4,2.9,4,4v16C4,21.1,4.9,22,6,22L6,22z" />
-</vector>
diff --git a/res/drawable/ic_settings_extdesk_hidestatusbar.xml b/res/drawable/ic_settings_extdesk_hidestatusbar.xml
deleted file mode 100644
index 22245dc..0000000
--- a/res/drawable/ic_settings_extdesk_hidestatusbar.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="M6,4h12v12H6V4Z
-M6,22h12c1.1,0,2-0.9,2-2V4c0-1.1-0.9-2-2-2H6C4.9,2,4,2.9,4,4v16C4,21.1,4.9,22,6,22L6,22z" />
-</vector>
diff --git a/res/drawable/ic_settings_statusbar.xml b/res/drawable/ic_settings_statusbar.xml
new file mode 100644
index 0000000..cfd04a4
--- /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>
-- 
cgit v1.1