From 59fcb01326e96bf6295fbe10738a8cb1538a78c3 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Mon, 4 Apr 2016 15:10:58 -0700 Subject: Adding help link to apps permissions page Added a menu item to link for the help center article for app permissions. Bug: b/22096093 Change-Id: Ic810bbcc64b20ab6ee21140f0bb3ea055c10813a --- res/values/strings.xml | 3 +++ .../permission/ui/handheld/AppPermissionsFragment.java | 3 +++ .../permission/ui/handheld/PermissionAppsFragment.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index dd755f5f..14214fd6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -307,4 +307,7 @@ Unknown + + + diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java index 5ecc7ab2..494d1599 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java @@ -52,6 +52,7 @@ import com.android.packageinstaller.permission.model.AppPermissions; import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.util.Utils; +import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; @@ -153,6 +154,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); menu.add(Menu.NONE, MENU_ALL_PERMS, Menu.NONE, R.string.all_permissions); + HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_app_permissions, + getClass().getName()); } private static void bindUi(SettingsWithHeader fragment, PackageInfo packageInfo) { diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java index 0fb1ad52..25689006 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java @@ -46,6 +46,7 @@ import com.android.packageinstaller.permission.model.PermissionApps.PermissionAp import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.util.Utils; +import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; @@ -113,6 +114,8 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple R.string.menu_show_system); mHideSystemMenu = menu.add(Menu.NONE, MENU_HIDE_SYSTEM, Menu.NONE, R.string.menu_hide_system); + HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_app_permissions, + getClass().getName()); updateMenu(); } -- cgit v1.2.3 From db783edf34ff3d228b9a5d5b14b0bf1e966ebd34 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Wed, 6 Apr 2016 16:12:01 -0700 Subject: Make side-load install path material design-y Bug: 26932948 Change-Id: Ic8bcec523fc6cd0db847a4575724fbe465e65c5d --- res/drawable/ic_android_92.xml | 25 ++++ res/drawable/ic_done_92.xml | 25 ++++ res/drawable/ic_report_problem_92.xml | 25 ++++ res/drawable/ic_result_status.xml | 21 --- res/layout/app_details.xml | 63 +++------ res/layout/install_confirm.xml | 149 -------------------- res/layout/install_start.xml | 155 ++++++++++++++++++--- res/layout/label.xml | 8 +- res/layout/op_progress.xml | 150 ++++++++++---------- res/layout/uninstall_confirm.xml | 14 ++ res/layout/uninstall_progress.xml | 17 ++- res/values/styles.xml | 21 ++- .../packageinstaller/InstallAppProgress.java | 32 ++--- .../packageinstaller/PackageInstallerActivity.java | 4 +- 14 files changed, 382 insertions(+), 327 deletions(-) create mode 100644 res/drawable/ic_android_92.xml create mode 100644 res/drawable/ic_done_92.xml create mode 100644 res/drawable/ic_report_problem_92.xml delete mode 100644 res/drawable/ic_result_status.xml delete mode 100644 res/layout/install_confirm.xml diff --git a/res/drawable/ic_android_92.xml b/res/drawable/ic_android_92.xml new file mode 100644 index 00000000..7d527377 --- /dev/null +++ b/res/drawable/ic_android_92.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/res/drawable/ic_done_92.xml b/res/drawable/ic_done_92.xml new file mode 100644 index 00000000..396338d3 --- /dev/null +++ b/res/drawable/ic_done_92.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/res/drawable/ic_report_problem_92.xml b/res/drawable/ic_report_problem_92.xml new file mode 100644 index 00000000..f262601f --- /dev/null +++ b/res/drawable/ic_report_problem_92.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/res/drawable/ic_result_status.xml b/res/drawable/ic_result_status.xml deleted file mode 100644 index bd8bf756..00000000 --- a/res/drawable/ic_result_status.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 8f7d2cff..aa6dd5ab 100644 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -18,49 +18,28 @@ Defines the layout of the application snippet that appears on top of the installation screens --> - - + + + + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center_vertical" + android:scaleType="fitCenter" /> + - - - + android:layout_gravity="center_vertical" + android:layout_marginLeft="32dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/titleTextStyle" + android:singleLine="true" + android:ellipsize="end" /> - + diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml deleted file mode 100644 index cb2aee84..00000000 --- a/res/layout/install_confirm.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -