From 0dc882ea06de7a322f62796883c45d5fd1f216f8 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sat, 5 Dec 2015 00:25:36 -0800
Subject: 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
---
 .../res/layout/actionbar_set_wallpaper.xml           |  4 ++--
 packages/WallpaperCropper/res/values/cm_colors.xml   | 20 --------------------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 packages/WallpaperCropper/res/values/cm_colors.xml

(limited to 'packages/WallpaperCropper')

diff --git a/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml b/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml
index bdd7e71..54f8ff3 100644
--- a/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml
+++ b/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 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.
@@ -32,5 +32,5 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:text="@string/wallpaper_instructions"
-        android:textColor="@color/set_wallpaper_text_color" />
+        android:textColor="@android:color/white" />
 </FrameLayout>
diff --git a/packages/WallpaperCropper/res/values/cm_colors.xml b/packages/WallpaperCropper/res/values/cm_colors.xml
deleted file mode 100644
index bfb2994..0000000
--- a/packages/WallpaperCropper/res/values/cm_colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>
-
-    <color name="set_wallpaper_text_color">@android:color/white</color>
-</resources>
-- 
cgit v1.1