diff options
| author | Alex Hills <ahills@google.com> | 2015-10-13 18:57:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-13 18:57:49 +0000 |
| commit | 42d2621f88d51f7cd26b660c8fa4a8e5dea39acf (patch) | |
| tree | 24a282703ed536a211c53272ff11938a40fe2ebf | |
| parent | 71b7629e6f664d0add65f10ef675c99862fea5b8 (diff) | |
| parent | 0e3c7dbdfc98fb9e79c4b2564be3fbade8896acf (diff) | |
| download | android_packages_apps_PackageInstaller-42d2621f88d51f7cd26b660c8fa4a8e5dea39acf.tar.gz android_packages_apps_PackageInstaller-42d2621f88d51f7cd26b660c8fa4a8e5dea39acf.tar.bz2 android_packages_apps_PackageInstaller-42d2621f88d51f7cd26b660c8fa4a8e5dea39acf.zip | |
am 0e3c7dbd: Modifies wear Permission title height to avoid clipping
* commit '0e3c7dbdfc98fb9e79c4b2564be3fbade8896acf':
Modifies wear Permission title height to avoid clipping
| -rw-r--r-- | res/layout-watch/settings_internal.xml | 3 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/res/layout-watch/settings_internal.xml b/res/layout-watch/settings_internal.xml index afedcf47..fdd21cef 100644 --- a/res/layout-watch/settings_internal.xml +++ b/res/layout-watch/settings_internal.xml @@ -17,7 +17,8 @@ <TextView android:id="@+id/header" android:layout_width="match_parent" - android:layout_height="@dimen/settings_header_base_height" + 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" diff --git a/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java b/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java index 64f42d0d..ef7efb28 100644 --- a/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/wear/TitledSettingsFragment.java @@ -207,9 +207,9 @@ public abstract class TitledSettingsFragment extends Fragment implements if (!singleLine) { height += getResources().getDimension(R.dimen.setting_header_extra_line_height); } + mHeader.setMinHeight((int) height); FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mHeader.getLayoutParams(); - params.height = (int) height; final Context context = getContext(); if (!singleLine) { // Make the top margin a little bit smaller so there is more space for the title. |