diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2016-07-13 20:58:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-13 20:58:30 +0000 |
| commit | efd0688be93d888b8a8522ef091388911e857f07 (patch) | |
| tree | cb50894657b611c621a5390b434c5a69f28f8590 /res | |
| parent | 11dc5591af499c715cc59163312de30a8d11ea11 (diff) | |
| parent | fd2efacaf3b17344e9366d324e86944c998e6908 (diff) | |
| download | android_packages_apps_PackageInstaller-efd0688be93d888b8a8522ef091388911e857f07.tar.gz android_packages_apps_PackageInstaller-efd0688be93d888b8a8522ef091388911e857f07.tar.bz2 android_packages_apps_PackageInstaller-efd0688be93d888b8a8522ef091388911e857f07.zip | |
Merge "Use packageinstaller-buttonbar in reviewactivity." into nyc-mr1-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/grant_permissions.xml | 2 | ||||
| -rw-r--r-- | res/layout/review_permissions.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index 92c0df9d..9b2194a2 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -87,7 +87,7 @@ </TextView> <Space - android:id="@*android:id/spacer" + android:id="@+id/spacer" android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1" diff --git a/res/layout/review_permissions.xml b/res/layout/review_permissions.xml index 462f9a54..71d31917 100644 --- a/res/layout/review_permissions.xml +++ b/res/layout/review_permissions.xml @@ -56,7 +56,7 @@ android:layout_weight="1"> </FrameLayout> - <com.android.internal.widget.ButtonBarLayout + <com.android.packageinstaller.permission.ui.ButtonBarLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -64,7 +64,7 @@ android:paddingTop="16dip"> <Space - android:id="@*android:id/spacer" + android:id="@+id/spacer" android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1" @@ -85,6 +85,6 @@ android:layout_marginStart="8dip" android:text="@string/review_button_continue" /> - </com.android.internal.widget.ButtonBarLayout> + </com.android.packageinstaller.permission.ui.ButtonBarLayout> </LinearLayout> |