diff options
Diffstat (limited to 'packages/SystemUI/res')
-rwxr-xr-x | packages/SystemUI/res/drawable-hdpi/ic_mini_settings.png | bin | 0 -> 192 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-mdpi/ic_mini_settings.png | bin | 0 -> 133 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-xhdpi/ic_mini_settings.png | bin | 0 -> 218 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-xxhdpi/ic_mini_settings.png | bin | 0 -> 324 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-xxxhdpi/ic_mini_settings.png | bin | 0 -> 401 bytes | |||
-rw-r--r-- | packages/SystemUI/res/layout/qs_detail_header.xml | 13 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/qs_settings.xml | 77 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/qs_settings_row.xml | 34 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/qs_tile_top.xml (renamed from packages/SystemUI/res/layout/qs_tile_top) | 19 | ||||
-rw-r--r-- | packages/SystemUI/res/values/cm_attrs.xml | 33 | ||||
-rw-r--r-- | packages/SystemUI/res/values/cm_strings.xml | 9 | ||||
-rw-r--r-- | packages/SystemUI/res/values/cm_styles.xml | 9 |
12 files changed, 183 insertions, 11 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_mini_settings.png b/packages/SystemUI/res/drawable-hdpi/ic_mini_settings.png Binary files differnew file mode 100755 index 0000000..4759a1c --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_mini_settings.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_mini_settings.png b/packages/SystemUI/res/drawable-mdpi/ic_mini_settings.png Binary files differnew file mode 100755 index 0000000..878169b --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_mini_settings.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_mini_settings.png b/packages/SystemUI/res/drawable-xhdpi/ic_mini_settings.png Binary files differnew file mode 100755 index 0000000..84807e8 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_mini_settings.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_mini_settings.png b/packages/SystemUI/res/drawable-xxhdpi/ic_mini_settings.png Binary files differnew file mode 100755 index 0000000..78bbc25 --- /dev/null +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_mini_settings.png diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_mini_settings.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_mini_settings.png Binary files differnew file mode 100755 index 0000000..6a6536e --- /dev/null +++ b/packages/SystemUI/res/drawable-xxxhdpi/ic_mini_settings.png diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml index 5a96dc3..6f07543 100644 --- a/packages/SystemUI/res/layout/qs_detail_header.xml +++ b/packages/SystemUI/res/layout/qs_detail_header.xml @@ -37,4 +37,15 @@ android:clickable="false" android:textAppearance="@style/TextAppearance.QS.DetailHeader" /> -</com.android.keyguard.AlphaOptimizedLinearLayout>
\ No newline at end of file + <TextView + android:id="@+id/done" + android:text="@string/quick_settings_done" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center" + android:minWidth="88dp" + android:paddingRight="12dp" + android:textAppearance="@style/TextAppearance.QS.DetailButton" + android:clickable="false" + android:focusable="false" /> +</com.android.keyguard.AlphaOptimizedLinearLayout> diff --git a/packages/SystemUI/res/layout/qs_settings.xml b/packages/SystemUI/res/layout/qs_settings.xml new file mode 100644 index 0000000..203364e --- /dev/null +++ b/packages/SystemUI/res/layout/qs_settings.xml @@ -0,0 +1,77 @@ +<?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. +--> +<com.android.systemui.qs.QSSettings + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res-auto" + android:id="@+id/quick_settings_settings_recursion_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="48dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_vertical" + android:textColor="#80cbc4" + android:text="@string/quick_settings_title_header"/> + + <!-- show weather --> + <com.android.systemui.qs.QSBooleanSettingRow + style="@style/SettingRow" + android:key="status_bar_show_weather" + android:title="@string/quick_settings_title_show_weather" + systemui:table="cm_system" + /> + + <TextView + android:layout_width="match_parent" + android:layout_height="48dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_vertical" + android:textColor="#80cbc4" + android:text="@string/quick_settings_title_tiles"/> + + <!-- TODO implement! + first row large + <com.android.systemui.qs.QSBooleanSettingRow + style="@style/SettingRow" + android:key="someKey1" + android:title="@string/quick_settings_title_enlarge_first_row" + systemui:table="system" + />--> + + <LinearLayout + android:id="@+id/reset_tiles" + style="@style/SettingRow"> + <TextView + android:layout_width="0dp" + android:layout_height="24dp" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:id="@+id/title" + android:textColor="@android:color/white" + android:text="@string/quick_settings_tile_reset_to_default" + android:contentDescription="@null"/> + + </LinearLayout> + +</com.android.systemui.qs.QSSettings> + diff --git a/packages/SystemUI/res/layout/qs_settings_row.xml b/packages/SystemUI/res/layout/qs_settings_row.xml new file mode 100644 index 0000000..98ac6fc --- /dev/null +++ b/packages/SystemUI/res/layout/qs_settings_row.xml @@ -0,0 +1,34 @@ +<?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. +--> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <TextView + android:layout_width="0dp" + android:layout_height="24dp" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:id="@+id/title" + android:textColor="@android:color/white" + android:contentDescription="@null"/> + + <Switch + android:id="@+id/switcher" + android:layout_width="wrap_content" + android:layout_height="24dp" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" + /> +</merge> diff --git a/packages/SystemUI/res/layout/qs_tile_top b/packages/SystemUI/res/layout/qs_tile_top.xml index 6d455ab..4847c77 100644 --- a/packages/SystemUI/res/layout/qs_tile_top +++ b/packages/SystemUI/res/layout/qs_tile_top.xml @@ -15,21 +15,21 @@ --> <com.android.systemui.qs.QSPanelTopView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/qs_panel_top" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/qs_brightness_padding_top"> + android:layout_height="match_parent"> <!-- brightness --> <include android:id="@+id/brightness_container" + android:paddingTop="@dimen/qs_brightness_padding_top" layout="@layout/quick_settings_brightness_dialog"/> <!-- delete target --> <LinearLayout android:id="@+id/delete_container" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:paddingTop="@dimen/qs_brightness_padding_top" android:paddingLeft="16dp" android:paddingRight="16dp" android:orientation="horizontal"> @@ -39,6 +39,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" + android:layout_gravity="center" android:src="@drawable/ic_delete" /> </LinearLayout> @@ -47,7 +48,8 @@ <LinearLayout android:id="@+id/edit_container" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:paddingTop="@dimen/qs_brightness_padding_top" android:paddingLeft="16dp" android:paddingRight="16dp" android:orientation="horizontal"> @@ -72,13 +74,14 @@ <TextView android:id="@+id/qs_toast" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:paddingTop="@dimen/qs_brightness_padding_top" android:paddingLeft="16dp" android:paddingRight="16dp" android:gravity="center_vertical" + android:layout_gravity="center_vertical" android:layout_width="match_parent" - android:textColor="@color/quick_settings_toast_color" - android:visibility="invisible"/> + android:textColor="@color/quick_settings_toast_color"/> </com.android.systemui.qs.QSPanelTopView> diff --git a/packages/SystemUI/res/values/cm_attrs.xml b/packages/SystemUI/res/values/cm_attrs.xml new file mode 100644 index 0000000..8e88e67 --- /dev/null +++ b/packages/SystemUI/res/values/cm_attrs.xml @@ -0,0 +1,33 @@ +<?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. +--> + +<resources> + <declare-styleable name="QuickSettingsRow"> + <attr name="table" format="enum"> + <enum name="system" value="0"/> + <enum name="global" value="1"/> + <enum name="secure" value="2"/> + + <enum name="cm_system" value="3"/> + <enum name="cm_global" value="4"/> + <enum name="cm_secure" value="5"/> + </attr> + + <attr name="android:key"/> + <attr name="android:title" /> + </declare-styleable> +</resources> + diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml index bba5d96..7b56807 100644 --- a/packages/SystemUI/res/values/cm_strings.xml +++ b/packages/SystemUI/res/values/cm_strings.xml @@ -73,10 +73,15 @@ <string name="led_notification_title">Light settings</string> <string name="led_notification_text">LED light enabled by settings</string> - <string name="qs_tile_edit_header_instruction">Press and hold a tile to edit</string> - <string name="quick_settings_edit_label">Edit Tiles</string> + <string name="qs_tile_edit_header_instruction">Press and hold tiles to rearrange</string> + <string name="quick_settings_edit_label">Edit tiles</string> <string name="quick_settings_cannot_delete_edit_tile">Cannot delete the Edit tile</string> <string name="qs_tiles_reset_confirmation">Reset quick settings tiles to default configuration?</string> + <string name="quick_settings_tile_reset_to_default">Reset to default layout</string> + <string name="quick_settings_title_header">Header</string> + <string name="quick_settings_title_tiles">Tiles</string> + <string name="quick_settings_title_show_weather">Show weather</string> + <string name="quick_settings_title_enlarge_first_row">Enlarge first row</string> <!-- Screen pinning dialog description (for devices without navbar) --> <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch and hold the Back button to unpin.</string> diff --git a/packages/SystemUI/res/values/cm_styles.xml b/packages/SystemUI/res/values/cm_styles.xml index 40b8929..36d8614 100644 --- a/packages/SystemUI/res/values/cm_styles.xml +++ b/packages/SystemUI/res/values/cm_styles.xml @@ -16,6 +16,15 @@ --> <resources> + <style name="SettingRow"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">48dp</item> + <item name="android:paddingLeft">16dp</item> + <item name="android:paddingRight">16dp</item> + <item name="android:background">?android:attr/selectableItemBackground</item> + <item name="android:clickable">true</item> + </style> + <style name="TextAppearance.StatusBar.Expanded.WeatherTemp"> <item name="android:textSize">12sp</item> <item name="android:textStyle">normal</item> |