summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable/expanded_close_bg.xml5
-rw-r--r--res/drawable/expanded_item_background.xml21
-rw-r--r--res/drawable/ic_settings_extdesk_hideboth.xml27
-rw-r--r--res/drawable/ic_settings_extdesk_hidenone.xml27
-rw-r--r--res/drawable/ic_settings_extdesk_hidestatusbar.xml27
-rw-r--r--res/layout/expanded_desktop.xml43
-rwxr-xr-xres/layout/expanded_item.xml72
-rw-r--r--res/menu/expanded_desktop.xml14
-rw-r--r--res/values/cm_arrays.xml12
-rw-r--r--res/values/cm_colors.xml3
-rw-r--r--res/values/cm_dimens.xml1
-rw-r--r--res/values/cm_strings.xml15
-rw-r--r--res/xml/display_settings.xml10
-rw-r--r--res/xml/expanded_desktop_prefs.xml26
14 files changed, 302 insertions, 1 deletions
diff --git a/res/drawable/expanded_close_bg.xml b/res/drawable/expanded_close_bg.xml
new file mode 100644
index 0000000..83193ab
--- /dev/null
+++ b/res/drawable/expanded_close_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="#40607D8B">
+</ripple>
diff --git a/res/drawable/expanded_item_background.xml b/res/drawable/expanded_item_background.xml
new file mode 100644
index 0000000..d6b8018
--- /dev/null
+++ b/res/drawable/expanded_item_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_activated="true" android:drawable="@drawable/expanded_item_bg_activated" />
+ <item android:state_activated="false" android:drawable="@drawable/expanded_item_bg" />
+</selector>
+
diff --git a/res/drawable/ic_settings_extdesk_hideboth.xml b/res/drawable/ic_settings_extdesk_hideboth.xml
new file mode 100644
index 0000000..a0371db
--- /dev/null
+++ b/res/drawable/ic_settings_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="#039588"
+ 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> \ No newline at end of file
diff --git a/res/drawable/ic_settings_extdesk_hidenone.xml b/res/drawable/ic_settings_extdesk_hidenone.xml
new file mode 100644
index 0000000..9b26576
--- /dev/null
+++ b/res/drawable/ic_settings_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="#039588"
+ 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> \ No newline at end of file
diff --git a/res/drawable/ic_settings_extdesk_hidestatusbar.xml b/res/drawable/ic_settings_extdesk_hidestatusbar.xml
new file mode 100644
index 0000000..66bb1a7
--- /dev/null
+++ b/res/drawable/ic_settings_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="#039588"
+ 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> \ No newline at end of file
diff --git a/res/layout/expanded_desktop.xml b/res/layout/expanded_desktop.xml
new file mode 100644
index 0000000..5c0b986
--- /dev/null
+++ b/res/layout/expanded_desktop.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <FrameLayout
+ android:id="@+id/extra_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <ListView
+ android:id="@+id/user_list_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"/>
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ style="@android:style/Widget.Material.ProgressBar.Large"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true" />
+ <TextView
+ android:id="@+id/nothing_to_show"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:text="@string/expanded_nothing_to_show"
+ android:visibility="gone" />
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/expanded_item.xml b/res/layout/expanded_item.xml
new file mode 100755
index 0000000..fbe34f7
--- /dev/null
+++ b/res/layout/expanded_item.xml
@@ -0,0 +1,72 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingTop="8dip"
+ android:paddingBottom="8dip"
+ android:orientation="horizontal"
+ android:background="@drawable/expanded_item_background">
+
+ <ImageView
+ android:id="@+id/app_icon"
+ android:layout_width="@android:dimen/app_icon_size"
+ android:layout_height="@android:dimen/app_icon_size"
+ android:layout_marginEnd="8dip"
+ android:layout_gravity="center_vertical"
+ android:scaleType="centerInside"
+ android:contentDescription="@null" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/app_name"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_gravity="fill_horizontal"
+ android:layout_marginTop="2dip"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:textColor="@android:color/black"
+ android:textAppearance="@style/TextAppearance.Medium"
+ android:textAlignment="viewStart" />
+
+ <Spinner
+ android:id="@+id/app_mode"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="fill_horizontal|top"
+ android:textAppearance="@style/TextAppearance.Small"
+ android:textAlignment="viewStart" />
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/state"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:scaleType="centerInside"
+ android:src="@drawable/ic_settings_extdesk_hidenone" />
+</LinearLayout>
diff --git a/res/menu/expanded_desktop.xml b/res/menu/expanded_desktop.xml
new file mode 100644
index 0000000..a324d99
--- /dev/null
+++ b/res/menu/expanded_desktop.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/enable_for_all"
+ android:title="Enable for all" />
+
+ <item
+ android:id="@+id/user_configurable"
+ android:title="User configurable" />
+
+ <item
+ android:id="@+id/disable_for_all"
+ android:title="Disable for all" />
+</menu> \ No newline at end of file
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 97c3a8e..6ed2d8c 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -379,4 +379,16 @@
<item>1</item>
<item>2</item>
</string-array>
+
+ <string-array name="expanded_desktop_entries" translatable="false">
+ <item>@string/expanded_hide_both</item>
+ <item>@string/expanded_hide_status</item>
+ <item>@string/expanded_hide_navigation</item>
+ </string-array>
+
+ <string-array name="expanded_desktop_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
</resources>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 3d09dac..e4b5ee2 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2014 The CyanogenMod Project
+Copyright (C) 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.
@@ -25,6 +25,7 @@ limitations under the License.
<drawable name="expanded_item_bg">@android:color/background_light</drawable>
<color name="expanded_button_color_normal">#4CAF50</color>
<color name="expanded_button_color_close">#F44336</color>
+
<color name="qs_tile_tint_color">#FF009587</color>
<!-- Hard coded background and text colors exposed for better theme support -->
diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml
index f09b96a..080dc51 100644
--- a/res/values/cm_dimens.xml
+++ b/res/values/cm_dimens.xml
@@ -16,4 +16,5 @@
-->
<resources>
<dimen name="profile_instruction_padding">8dp</dimen>
+ <dimen name="fab_line_width">2dp</dimen>
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index cd86275..e3d60bf 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -682,4 +682,19 @@
<!-- Advanced reboot options -->
<string name="advanced_reboot_title">Advanced reboot</string>
<string name="advanced_reboot_summary">When unlocked, include options in the power menu for rebooting into recovery, bootloader or performing a soft reboot</string>
+
+ <string name="category_interface">Interface</string>
+ <!-- Expanded desktop -->
+ <string name="power_menu_expanded_desktop">Expanded desktop</string>
+ <string name="expanded_hide_nothing">Hide nothing</string>
+ <string name="expanded_hide_status">Hide status bar</string>
+ <string name="expanded_hide_navigation">Hide navigation bar</string>
+ <string name="expanded_hide_both">Hide both</string>
+ <string name="expanded_nothing_to_show">To add a custom per-app configuration for expanded state, set "Enabled for all" to the off position</string>
+ <string name="expanded_desktop_state">Expanded state</string>
+ <string name="expanded_enabled_for_all">Enabled for all</string>
+ <string name="expanded_user_configurable">User configurable</string>
+ <string name="expanded_desktop_style">Expanded desktop style</string>
+ <string name="expanded_desktop_style_description">Choose a default expanded desktop style</string>
+ <string name="expanded_desktop_title">Expanded desktop options</string>
</resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a136203..21c3837 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -129,6 +129,16 @@
android:fragment="com.android.settings.wfd.WifiDisplaySettings" />
<PreferenceCategory
+ android:key="interface"
+ android:title="@string/category_interface">
+ <!-- expanded desktop -->
+ <PreferenceScreen
+ android:key="expanded_desktop"
+ android:title="@string/power_menu_expanded_desktop"
+ android:fragment="com.android.settings.applications.ExpandedDesktopPreferenceFragment" />
+ </PreferenceCategory>
+
+ <PreferenceCategory
android:key="advanced_display_prefs"
android:title="@string/advanced_settings">
diff --git a/res/xml/expanded_desktop_prefs.xml b/res/xml/expanded_desktop_prefs.xml
new file mode 100644
index 0000000..4a47d8f
--- /dev/null
+++ b/res/xml/expanded_desktop_prefs.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <PreferenceCategory
+ android:title="@string/expanded_desktop_title" >
+ <ListPreference
+ android:key="expanded_desktop_style"
+ android:title="@string/expanded_desktop_style"
+ android:entries="@array/expanded_desktop_entries"
+ android:entryValues="@array/expanded_desktop_values"/>
+ </PreferenceCategory>
+</PreferenceScreen> \ No newline at end of file