Merge "Permissions Watch settings UI port" into cw-e-dev

2 files changed, 57 insertions, 0 deletions

diff --git a/res/layout-watch/settings.xml b/res/layout-watch/settings.xml
new file mode 100644
index 00000000..46249d50
--- /dev/null
+++ b/res/layout-watch/settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <include layout="@layout/settings_internal" />
+</FrameLayout>
diff --git a/res/layout-watch/settings_internal.xml b/res/layout-watch/settings_internal.xml
new file mode 100644
index 00000000..afedcf47
--- /dev/null
+++ b/res/layout-watch/settings_internal.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <TextView
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/settings_header_base_height"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="@dimen/settings_header_top_margin"
+        android:textSize="@dimen/setting_short_header_text_size"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textColor="#9E9E9E"
+        android:fontFamily="sans-serif-condensed-light"
+        />
+
+    <android.support.wearable.view.WearableListView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/wheel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+</merge>