diff options
author | Anthony Hugh <ahugh@google.com> | 2015-09-16 01:52:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-16 01:52:40 +0000 |
commit | fbe307f9ee43b750ff8cae2658c1e0f03676da60 (patch) | |
tree | 86268e49b3b4b7e7e041d78f9e262a50b1618f5b /res/layout-watch | |
parent | e31ffee066934ac4f8d66d0648c21be190a332c8 (diff) | |
parent | 6412dc4a8f47b134af6c5abb5f7f30321bb3ce68 (diff) | |
download | android_packages_apps_PackageInstaller-fbe307f9ee43b750ff8cae2658c1e0f03676da60.tar.gz android_packages_apps_PackageInstaller-fbe307f9ee43b750ff8cae2658c1e0f03676da60.tar.bz2 android_packages_apps_PackageInstaller-fbe307f9ee43b750ff8cae2658c1e0f03676da60.zip |
Merge "Permissions Watch settings UI port" into cw-e-dev
Diffstat (limited to 'res/layout-watch')
-rw-r--r-- | res/layout-watch/settings.xml | 21 | ||||
-rw-r--r-- | res/layout-watch/settings_internal.xml | 36 |
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> |