summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorVinod Krishnan <vinodkrishnan@google.com>2014-05-16 02:45:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-16 02:45:59 +0000
commit37a5e7a21a018211b4502f80187a1dd23d71fd9f (patch)
tree0bb428145f61e0d0fdfbe3017e878b7adcb9697a /data
parent57ec0ec10d4e71f7d8ff603ff229c8fd55832e21 (diff)
parentbd0f91537be0e506a92687d6084a2659cf34399c (diff)
downloadframeworks_native-37a5e7a21a018211b4502f80187a1dd23d71fd9f.zip
frameworks_native-37a5e7a21a018211b4502f80187a1dd23d71fd9f.tar.gz
frameworks_native-37a5e7a21a018211b4502f80187a1dd23d71fd9f.tar.bz2
am bd0f9153: am 7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev
* commit 'bd0f91537be0e506a92687d6084a2659cf34399c': Adding a portrait and landscape file
Diffstat (limited to 'data')
-rw-r--r--data/etc/android.hardware.screen.landscape.xml20
-rw-r--r--data/etc/android.hardware.screen.portrait.xml20
-rw-r--r--data/etc/wearable_core_hardware.xml2
3 files changed, 40 insertions, 2 deletions
diff --git a/data/etc/android.hardware.screen.landscape.xml b/data/etc/android.hardware.screen.landscape.xml
new file mode 100644
index 0000000..07bcd0a
--- /dev/null
+++ b/data/etc/android.hardware.screen.landscape.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+
+<!-- Standard feature indicating that the device supports landscape mode. -->
+<permissions>
+ <feature name="android.hardware.screen.landscape" />
+</permissions>
diff --git a/data/etc/android.hardware.screen.portrait.xml b/data/etc/android.hardware.screen.portrait.xml
new file mode 100644
index 0000000..530c6c6
--- /dev/null
+++ b/data/etc/android.hardware.screen.portrait.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+
+<!-- Standard feature indicating that the device supports portrait mode. -->
+<permissions>
+ <feature name="android.hardware.screen.portrait" />
+</permissions>
diff --git a/data/etc/wearable_core_hardware.xml b/data/etc/wearable_core_hardware.xml
index e256742..09a064a 100644
--- a/data/etc/wearable_core_hardware.xml
+++ b/data/etc/wearable_core_hardware.xml
@@ -27,8 +27,6 @@
<feature name="android.hardware.bluetooth" />
<feature name="android.hardware.touchscreen" />
<feature name="android.hardware.microphone" />
- <feature name="android.hardware.screen.portrait" />
- <feature name="android.hardware.screen.landscape" />
<!-- basic system services -->
<feature name="android.software.home_screen" />