summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorYvonne Wong <ywong@cyngn.com>2015-12-08 16:54:40 -0800
committerYvonne Wong <ywong@cyngn.com>2015-12-10 01:43:18 -0800
commit7600c7f3125a845ce6d4add4ceff90b884e1c033 (patch)
tree08bbde6eb2cf2da2a1b1d1a62d5dcbdf4d02f715 /res
parent045e7db9f0add18e1d95b806417e40fd213de35e (diff)
downloadandroid_packages_apps_Trebuchet-7600c7f3125a845ce6d4add4ceff90b884e1c033.tar.gz
android_packages_apps_Trebuchet-7600c7f3125a845ce6d4add4ceff90b884e1c033.tar.bz2
android_packages_apps_Trebuchet-7600c7f3125a845ce6d4add4ceff90b884e1c033.zip
Reimplement CM Settings Overview Panel Part 5
- Enable default screen button - Make UI changes to settings panel - Add a broadcast receiver for hide/unhide search bar setting Change-Id: I849dd412231795b894e7af7ee575e60feb618c70
Diffstat (limited to 'res')
-rw-r--r--res/layout/settings_pane_list_header.xml6
-rw-r--r--res/layout/settings_pane_list_item.xml18
-rw-r--r--res/values/dimens.xml4
3 files changed, 19 insertions, 9 deletions
diff --git a/res/layout/settings_pane_list_header.xml b/res/layout/settings_pane_list_header.xml
index a7d04e36e..8c35fb865 100644
--- a/res/layout/settings_pane_list_header.xml
+++ b/res/layout/settings_pane_list_header.xml
@@ -15,7 +15,7 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/overview_panel_list_header_height"
android:layout_gravity="center_horizontal|bottom"
android:background="@color/settings_bg_color"
android:paddingLeft="@dimen/overview_panel_list_padding"
@@ -27,8 +27,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
- android:fontFamily="sans-serif-condensed"
+ android:fontFamily="sans-serif-medium"
android:gravity="left"
- android:textSize="16sp"
+ android:textSize="14sp"
android:textColor="@color/settings_header_text"/>
</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml
index 58b2de862..6c8c3c719 100644
--- a/res/layout/settings_pane_list_item.xml
+++ b/res/layout/settings_pane_list_item.xml
@@ -1,6 +1,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/overview_panel_list_item_height"
android:layout_gravity="center_horizontal|bottom"
android:background="@drawable/listitem_bg"
android:paddingStart="@dimen/overview_panel_list_padding"
@@ -9,13 +9,21 @@
android:paddingTop="@dimen/overview_panel_list_padding"
android:orientation="horizontal" >
+ <Switch
+ android:id="@+id/setting_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_alignParentEnd="true"
+ android:visibility="invisible"/>
+
<TextView
android:id="@+id/item_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
- android:fontFamily="sans-serif-condensed"
- android:textSize="20sp"
+ android:fontFamily="sans-serif"
+ android:textSize="16sp"
android:textAllCaps="true"
android:textColor="@drawable/listitem_text"
android:layout_alignParentEnd="true"
@@ -28,8 +36,8 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:drawablePadding="4dp"
- android:fontFamily="sans-serif-condensed"
- android:textSize="20sp"
+ android:fontFamily="sans-serif"
+ android:textSize="16sp"
android:textColor="@drawable/listitem_text"
android:layout_toStartOf="@id/item_state"
android:layout_alignParentStart="true"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d73bd33db..44edfcb6e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -172,11 +172,13 @@
<!-- Overview panel -->
<dimen name="sliding_panel_padding">175dp</dimen>
+ <dimen name="overview_panel_list_header_height">48dp</dimen>
+ <dimen name="overview_panel_list_item_height">56dp</dimen>
<dimen name="overview_panel_top_padding">20dp</dimen>
<dimen name="overview_panel_bottom_padding">50dp</dimen>
<dimen name="overview_panel_button_spacing">30dp</dimen>
<dimen name="overview_panel_list_padding">16dp</dimen>
<dimen name="overview_mode_page_offset">60dp</dimen>
<dimen name="overview_scaling_padding">50dp</dimen>
-
+
</resources>