diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-05 00:25:36 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-05 00:52:17 -0800 |
| commit | 0dc882ea06de7a322f62796883c45d5fd1f216f8 (patch) | |
| tree | 299030c060d2b1ce4fe5bf7950afe3659d815e49 /packages/DocumentsUI | |
| parent | c1cacfbc14e29916194048218f5d483f4b3554e3 (diff) | |
| download | frameworks_base-0dc882ea06de7a322f62796883c45d5fd1f216f8.zip frameworks_base-0dc882ea06de7a322f62796883c45d5fd1f216f8.tar.gz frameworks_base-0dc882ea06de7a322f62796883c45d5fd1f216f8.tar.bz2 | |
Revert "Themes: Expose "ALL" layouts hard code in frameworks base for themes"
* Many apps which display listviews crash with this change. Reverting
for now.
This reverts commit e6458a3380b36ab0e3538159e854b7f815a838f3.
Change-Id: Icc4d0ee18c708a5692db0b20f7b6b2084d8dd43b
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/res/layout-sw720dp/activity.xml | 4 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/layout/activity.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/cm_colors.xml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/DocumentsUI/res/layout-sw720dp/activity.xml b/packages/DocumentsUI/res/layout-sw720dp/activity.xml index f72d3ab..221de13 100644 --- a/packages/DocumentsUI/res/layout-sw720dp/activity.xml +++ b/packages/DocumentsUI/res/layout-sw720dp/activity.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project +<!-- Copyright (C) 2013 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - android:background="@color/toolbar_background_color" + android:background="?android:attr/colorPrimary" android:elevation="8dp" android:theme="?android:attr/actionBarTheme"> diff --git a/packages/DocumentsUI/res/layout/activity.xml b/packages/DocumentsUI/res/layout/activity.xml index b8557ee..3de76d0 100644 --- a/packages/DocumentsUI/res/layout/activity.xml +++ b/packages/DocumentsUI/res/layout/activity.xml @@ -28,7 +28,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - android:background="@color/toolbar_background_color" + android:background="?android:attr/colorPrimary" android:elevation="8dp" android:theme="?android:attr/actionBarTheme"> diff --git a/packages/DocumentsUI/res/values/cm_colors.xml b/packages/DocumentsUI/res/values/cm_colors.xml index abeb20c..1fa1a80 100644 --- a/packages/DocumentsUI/res/values/cm_colors.xml +++ b/packages/DocumentsUI/res/values/cm_colors.xml @@ -19,5 +19,5 @@ <!-- adding new exposed theme components --> <color name="drawer_background_color">#ffffffff</color> <color name="font_color_doc_grid">#ffffffff</color> - <color name="toolbar_background_color">?android:attr/colorPrimary</color> + </resources> |