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/Keyguard/res | |
| 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/Keyguard/res')
4 files changed, 3 insertions, 22 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_pin_view.xml b/packages/Keyguard/res/layout/keyguard_pin_view.xml index b0a86bb..d3fb982 100644 --- a/packages/Keyguard/res/layout/keyguard_pin_view.xml +++ b/packages/Keyguard/res/layout/keyguard_pin_view.xml @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/keyguard_sim_view_divider" + android:background="#28FFFFFF" /> </com.android.keyguard.AlphaOptimizedRelativeLayout> <LinearLayout diff --git a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml index fe514a6..b0a93e6 100644 --- a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml +++ b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml @@ -83,7 +83,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/keyguard_sim_view_divider" + android:background="#28FFFFFF" /> </RelativeLayout> <LinearLayout diff --git a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml index 30cc815..cf41bd3 100644 --- a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml +++ b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml @@ -84,7 +84,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/keyguard_sim_view_divider" + android:background="#28FFFFFF" /> </RelativeLayout> <LinearLayout diff --git a/packages/Keyguard/res/values/cm_colors.xml b/packages/Keyguard/res/values/cm_colors.xml deleted file mode 100644 index ffdc532..0000000 --- a/packages/Keyguard/res/values/cm_colors.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 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. - 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> - - <color name="keyguard_sim_view_divider">#28FFFFFF</color> -</resources> |