summaryrefslogtreecommitdiffstats
path: root/AdvancedDisplay/res/values/custom_attrs.xml
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-15 11:54:10 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-15 11:54:10 +0100
commit60e5a34630c69e575f157a2babac70048cc3bdb1 (patch)
tree9691d92caa5fba82bf307cf2af3374c616053bb8 /AdvancedDisplay/res/values/custom_attrs.xml
parent8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff)
parent02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff)
downloaddevice_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip
device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz
device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts: BoardCommonConfig.mk camera/Android.mk common.mk configs/80cfw lpm.rc overlay/frameworks/base/core/res/res/values/config.xml overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'AdvancedDisplay/res/values/custom_attrs.xml')
-rw-r--r--AdvancedDisplay/res/values/custom_attrs.xml27
1 files changed, 27 insertions, 0 deletions
diff --git a/AdvancedDisplay/res/values/custom_attrs.xml b/AdvancedDisplay/res/values/custom_attrs.xml
new file mode 100644
index 0000000..b856986
--- /dev/null
+++ b/AdvancedDisplay/res/values/custom_attrs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The ChameleonOS 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <declare-styleable name="SeekBarPreference">
+ <attr name="min" format="integer" />
+ <attr name="unitsLeft" format="string" />
+ <attr name="unitsRight" format="string" />
+ </declare-styleable>
+
+</resources> \ No newline at end of file