diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-07-13 23:01:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 23:01:44 +0000 |
| commit | 078779b0669886dd001ae1908f62f3d7f22cceaf (patch) | |
| tree | 580f9bc8837e97c1ded1107502b0ae3083d91c68 /res | |
| parent | c71507dab921ff619c3a409ce9531941cf55fcf1 (diff) | |
| parent | d138f2c8ab877a8dd4b00d02358c2e9c528a174f (diff) | |
| download | android_packages_apps_PackageInstaller-078779b0669886dd001ae1908f62f3d7f22cceaf.tar.gz android_packages_apps_PackageInstaller-078779b0669886dd001ae1908f62f3d7f22cceaf.tar.bz2 android_packages_apps_PackageInstaller-078779b0669886dd001ae1908f62f3d7f22cceaf.zip | |
am d138f2c8: Merge "Remove personal/device group & skip perm screen for M+ apps." into mnc-dev
* commit 'd138f2c8ab877a8dd4b00d02358c2e9c528a174f':
Remove personal/device group & skip perm screen for M+ apps.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/permissions_list.xml | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/res/layout/permissions_list.xml b/res/layout/permissions_list.xml index c2b2b2a0..5e3ae0f5 100644 --- a/res/layout/permissions_list.xml +++ b/res/layout/permissions_list.xml @@ -22,33 +22,10 @@ This is the structure for the list of all permissions. android:id="@+id/scrollview" android:fillViewport="true"> <LinearLayout + android:id="@+id/permission_list" android:orientation="vertical" android:layout_width="match_parent" android:paddingEnd="4dp" android:layout_height="wrap_content"> - <LinearLayout android:id="@+id/privacylist" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp"> - <TextView - style="?android:attr/listSeparatorTextViewStyle" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:text="@string/privacyPerms" /> - </LinearLayout> - <LinearLayout android:id="@+id/devicelist" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp"> - <TextView - style="?android:attr/listSeparatorTextViewStyle" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:text="@string/devicePerms" /> - </LinearLayout> </LinearLayout> </com.android.packageinstaller.CaffeinatedScrollView> |