diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-06-30 22:42:18 -0700 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-06-30 22:42:18 -0700 |
commit | 1cf1cb46e81002f756e6141fcd813eb1df44a2f5 (patch) | |
tree | 74c0a8aa932193154abc4e1981c17a6c238582b4 /res/xml/preferences_general.xml | |
parent | 4b66843493c8a8cc2bf01ac45566b71b2393a5ec (diff) | |
parent | ebf8f37515c23a167cef2bb8cff04854c52fd35b (diff) | |
download | android_packages_apps_Trebuchet-1cf1cb46e81002f756e6141fcd813eb1df44a2f5.tar.gz android_packages_apps_Trebuchet-1cf1cb46e81002f756e6141fcd813eb1df44a2f5.tar.bz2 android_packages_apps_Trebuchet-1cf1cb46e81002f756e6141fcd813eb1df44a2f5.zip |
Merge branch 'cm-11.0' into stable/cm-11.0
Conflicts:
res/values-et/cm_strings.xml
res/values-th/cm_arrays.xml
res/values-th/cm_strings.xml
Change-Id: If66ec311e06bca36268c52b42b61425c3b044556
Diffstat (limited to 'res/xml/preferences_general.xml')
-rw-r--r-- | res/xml/preferences_general.xml | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml deleted file mode 100644 index 96b93ec44..000000000 --- a/res/xml/preferences_general.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3" - android:key="ui_general" - android:title="@string/preferences_interface_general_title"> - <PreferenceCategory android:title="@string/preferences_interface_general_icons_category"> - <CheckBoxPreference android:key="ui_general_icons_large" - android:title="@string/preferences_interface_general_icons_large_title" - android:summary="@string/preferences_interface_general_icons_large_summary" - android:defaultValue="@bool/preferences_interface_general_icons_large_default" /> - <com.android.launcher3.settings.FontStylePreference android:key="ui_general_icons_text_font" - android:title="@string/preferences_interface_general_icons_text_style_title" - android:summary="@string/preferences_interface_general_icons_text_style_summary" - android:entries="@array/preferences_interface_general_icons_text_font_family_entries" - android:entryValues="@array/preferences_interface_general_icons_text_font_family_values" - android:defaultValue="@string/preferences_interface_general_icons_text_font_family_default" /> - </PreferenceCategory> - -</PreferenceScreen> |