diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-06-19 17:47:11 -0700 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-06-27 10:18:18 +0000 |
| commit | 80c47b2f7961a5a8de1c6ec5751c04d15d42122a (patch) | |
| tree | c45a6112150d7a3063d2df77dcb11ab251e8cde7 /java/res | |
| parent | d966c0727fc7706b2ed28e09cd323f79236292c8 (diff) | |
| download | latinime-80c47b2f7961a5a8de1c6ec5751c04d15d42122a.tar.gz latinime-80c47b2f7961a5a8de1c6ec5751c04d15d42122a.tar.xz latinime-80c47b2f7961a5a8de1c6ec5751c04d15d42122a.zip | |
Use Settings app's theme for L and later
This CL must be checked in together with I506b9ae6ea.
Bug: 11866784
Change-Id: I00aa90618642758c783f7c92f162dc2ee16659a6
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-v20/platform-theme.xml | 26 | ||||
| -rw-r--r-- | java/res/values/platform-theme.xml | 1 |
2 files changed, 1 insertions, 26 deletions
diff --git a/java/res/values-v20/platform-theme.xml b/java/res/values-v20/platform-theme.xml deleted file mode 100644 index 52e7f3521..000000000 --- a/java/res/values-v20/platform-theme.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2014, 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. -*/ ---> - -<!-- TODO: This file is temporarily placed under values-v20. --> -<!-- TODO: It might be moved under values-v21. --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="platformActivityTheme" parent="@android:style/Theme.Material.Light" /> - <style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" /> -</resources> diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml index 8e131a2b0..e68859712 100644 --- a/java/res/values/platform-theme.xml +++ b/java/res/values/platform-theme.xml @@ -20,5 +20,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="platformActivityTheme" parent="@android:style/Theme.Holo" /> + <style name="platformSettingsTheme" parent="@android:style/Theme.Holo" /> <style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" /> </resources> |