diff options
author | Adnan Begovic <adnan@cyngn.com> | 2015-12-01 16:34:10 -0800 |
---|---|---|
committer | Adnan Begovic <adnan@cyngn.com> | 2015-12-07 15:24:06 -0800 |
commit | cf6674d766fe683e52e5c58e63152e9abd6ece89 (patch) | |
tree | 3b97dd23035ab50586b3ab55c9a824771cd7c4b7 /packages/SystemUI/res | |
parent | 95cce6e3e8586592511c83ebde6edb51ee6fdd0f (diff) | |
download | frameworks_base-cf6674d766fe683e52e5c58e63152e9abd6ece89.zip frameworks_base-cf6674d766fe683e52e5c58e63152e9abd6ece89.tar.gz frameworks_base-cf6674d766fe683e52e5c58e63152e9abd6ece89.tar.bz2 |
SystemUi: Reintroduce custom qs tiles management.
Change-Id: I88dbf3911d4783de7c3f231aa57c51ce43bc8ae6
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/layout/qs_custom_detail.xml | 57 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/qs_detail.xml | 10 | ||||
-rw-r--r-- | packages/SystemUI/res/values/cm_strings.xml | 3 | ||||
-rw-r--r-- | packages/SystemUI/res/values/cm_styles.xml | 4 |
4 files changed, 74 insertions, 0 deletions
diff --git a/packages/SystemUI/res/layout/qs_custom_detail.xml b/packages/SystemUI/res/layout/qs_custom_detail.xml new file mode 100644 index 0000000..f7a002e --- /dev/null +++ b/packages/SystemUI/res/layout/qs_custom_detail.xml @@ -0,0 +1,57 @@ +<?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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="8dp"> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="match_parent" + android:orientation="horizontal"> + + <ImageView android:id="@+id/custom_qs_tile_icon" + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_marginEnd="12dp" /> + + <LinearLayout android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:orientation="vertical"> + + <TextView android:id="@+id/custom_qs_tile_title" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary"/> + + <TextView android:id="@+id/custom_qs_tile_package " + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginTop="2dp" + android:textAppearance="@style/TextAppearance.QS.DetailItemSub"/> + + <TextView android:id="@+id/custom_qs_tile_content_description" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginTop="2dp" + android:textAppearance="@style/TextAppearance.QS.DetailItemSub" /> + + </LinearLayout> + + </LinearLayout> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index ddff0f0..14ecd33 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -44,6 +44,16 @@ android:focusable="true" /> <TextView + android:id="@android:id/button3" + style="@style/QSBorderlessButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:minWidth="88dp" + android:textAppearance="@style/TextAppearance.QS.DetailButton" + android:focusable="true" /> + + <TextView android:id="@android:id/button1" style="@style/QSBorderlessButton" android:layout_width="wrap_content" diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml index 7b56807..0750700 100644 --- a/packages/SystemUI/res/values/cm_strings.xml +++ b/packages/SystemUI/res/values/cm_strings.xml @@ -85,4 +85,7 @@ <!-- 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> + + <string name="quick_settings_custom_tile_detail_title">Custom Tile</string> + <string name="quick_settings_remove">Remove tile</string> </resources> diff --git a/packages/SystemUI/res/values/cm_styles.xml b/packages/SystemUI/res/values/cm_styles.xml index 36d8614..8caa89d 100644 --- a/packages/SystemUI/res/values/cm_styles.xml +++ b/packages/SystemUI/res/values/cm_styles.xml @@ -37,4 +37,8 @@ <item name="android:textColor">@color/status_bar_temperature_location_text_color</item> </style> + <style name="TextAppearance.QS.DetailItemSub"> + <item name="android:textSize">@dimen/qs_detail_item_secondary_text_size</item> + </style> + </resources> |