ef86137 - platform/packages/apps/PackageInstaller

commit	ef861375eebd9ac6cce7c0bb163380ab1c951063	[log] [tgz]
author	Svetoslav <svetoslavganov@google.com>	Fri Nov 20 14:00:11 2015 -0800
committer	Svetoslav <svetoslavganov@google.com>	Fri Nov 20 14:02:19 2015 -0800
tree	870ae89605e49658de3e5abca2797b68c5efbb26
parent	9c78316fe6baa4f7fd7d5108349ecf8a2532b047 [diff]

resolve merge conflicts of c10abb25f3 to cw-e-dev.

Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518

res/drawable/header_background.xml[Deleted - diff]
res/drawable/ic_dialog_alert_material.xml[Added - diff]
res/drawable/ic_more_items.xml[Added - diff]
res/layout/app_details.xml[diff]
res/layout/grant_permissions.xml[diff]
res/layout/header.xml[diff]
res/layout/install_confirm.xml[diff]
res/layout/permission_description.xml[diff]
res/layout/permissions_frame.xml[diff]
res/layout/preference_permissions.xml[diff]
res/layout/preference_permissions_switch.xml[diff]
res/layout/uninstall_confirm.xml[diff]
res/values-television/colors.xml[diff]
res/values-television/styles.xml[Added - diff]
res/values/colors.xml[Deleted - diff]
res/values/styles.xml[diff]
res/values/themes.xml[diff]
src/com/android/packageinstaller/permission/model/PermissionApps.java[diff]
src/com/android/packageinstaller/permission/ui/ButtonBarLayout.java[Added - diff]
src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java[diff]
src/com/android/packageinstaller/permission/ui/GrantPermissionsViewHandler.java[diff]
src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java[diff]
src/com/android/packageinstaller/permission/ui/OverlayWarningDialog.java[diff]
src/com/android/packageinstaller/permission/ui/PreferenceImageView.java[Added - diff]
src/com/android/packageinstaller/permission/ui/handheld/AllAppPermissionsFragment.java[Copied from src/com/android/packageinstaller/permission/ui/AllAppPermissionsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java[Copied from src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/handheld/GrantPermissionsViewHandlerImpl.java[Renamed from src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java - diff]
src/com/android/packageinstaller/permission/ui/handheld/ManagePermissionsFragment.java[Copied from src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java[Copied from src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/handheld/PermissionsFrameFragment.java[Added - diff]
src/com/android/packageinstaller/permission/ui/handheld/SettingsWithHeader.java[Added - diff]
src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java[Renamed from src/com/android/packageinstaller/permission/ui/AllAppPermissionsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java[Renamed from src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/television/GrantPermissionsViewHandlerImpl.java[Renamed from src/com/android/packageinstaller/permission/ui/GrantPermissionsTvViewHandler.java - diff]
src/com/android/packageinstaller/permission/ui/television/ManagePermissionsFragment.java[Renamed from src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java[Renamed from src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java - diff]
src/com/android/packageinstaller/permission/ui/television/PermissionsFrameFragment.java[Added - diff]
src/com/android/packageinstaller/permission/ui/television/SettingsWithHeader.java[Added - diff]
src/com/android/packageinstaller/permission/utils/LocationUtils.java[diff]

39 files changed

tree: 870ae89605e49658de3e5abca2797b68c5efbb26