diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2016-03-21 17:54:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-21 17:54:54 +0000 |
| commit | f7ac4baf1459752e0ed0b62a61df5048784e1b17 (patch) | |
| tree | 0a4f48f2c6eaf41182ad419b4edc3de4e5b7e739 /res | |
| parent | ad6218a2c0991a34a9f9e7ff375c0088a12e42ef (diff) | |
| parent | 3cc4e9da825cc19608e8d9f9df4c5a5d8eff379a (diff) | |
| download | android_packages_apps_PackageInstaller-f7ac4baf1459752e0ed0b62a61df5048784e1b17.tar.gz android_packages_apps_PackageInstaller-f7ac4baf1459752e0ed0b62a61df5048784e1b17.tar.bz2 android_packages_apps_PackageInstaller-f7ac4baf1459752e0ed0b62a61df5048784e1b17.zip | |
Merge changes I285e3269,I0c4c9ceb into nyc-dev
* changes:
Show No permissions, if there are no permissions
Wear Cleanup: Removing implicit intent & API change
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-watch/settings_internal.xml | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/res/layout-watch/settings_internal.xml b/res/layout-watch/settings_internal.xml index fdd21cef..e1947aaa 100644 --- a/res/layout-watch/settings_internal.xml +++ b/res/layout-watch/settings_internal.xml @@ -14,19 +14,38 @@ limitations under the License. --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> - <TextView - android:id="@+id/header" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@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:layout_height="match_parent" + android:orientation="vertical"> + <TextView + android:id="@+id/header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@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" + /> + + <TextView + android:id="@+id/details" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/settings_header_base_height" + android:layout_marginLeft="16dp" + android:layout_marginTop="@dimen/settings_header_top_margin" + android:maxLines="2" + android:ellipsize="end" + android:textColor="@color/permissions_settings_item_color" + android:textSize="14sp" + android:visibility="gone" /> + </LinearLayout> <android.support.wearable.view.WearableListView xmlns:android="http://schemas.android.com/apk/res/android" |