summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Make "1 more" a plurals for translation purposes" into mnc-devJason Monk2015-07-082-4/+6
|\
| * Make "1 more" a plurals for translation purposesJason Monk2015-07-072-4/+6
| | | | | | | | | | Bug: 22229652 Change-Id: Id0a142eddfe1e3dda5d5910196dce138484a7a7d
* | Merge "Add loading screens to permissions" into mnc-devJason Monk2015-07-084-5/+70
|\ \
| * | Add loading screens to permissionsJason Monk2015-07-074-5/+70
| |/ | | | | | | | | | | | | Styled the same way as in settings. Bug: 22234767 Change-Id: If21d71b132e5f0e69b65109c479162f03116dab8
* | Merge "Update grant result when a granted permission was requeried and ↵Svet Ganov2015-07-071-1/+1
|\ \ | |/ |/| | | denied." into mnc-dev
| * Update grant result when a granted permission was requeried and denied.Svet Ganov2015-07-061-1/+1
| | | | | | | | Change-Id: I98fe8099144d51d852fae6ab604fa6e85b1e13f6
* | Merge "Display explanatory text in 'App permissions' settings when ↵Alex Chau2015-07-062-0/+6
|\ \ | | | | | | | | | permissions policies are enforced" into mnc-dev
| * | Display explanatory text in 'App permissions' settings when permissions ↵Alex Chau2015-07-032-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policies are enforced "Enforced by policy" is shown in summary when permissions are enforced by policy, in both permission grouped by app and app grouped by permission screen Bug: 22195440 Change-Id: I3a6e0eae43e0ddf07bbeb43c968c3422b6e6a13b
* | | Merge "Consider only dagerous permissions of a group in permission apps ↵Svet Ganov2015-07-061-4/+9
|\ \ \ | | | | | | | | | | | | screen" into mnc-dev
| * | | Consider only dagerous permissions of a group in permission apps screenSvet Ganov2015-07-021-4/+9
| | |/ | |/| | | | | | | | | | | | | bug:22173337 Change-Id: If484f7d5d8820cbdbf84dcf67d71e74e00c1bbcd
* | | Merge "Show basic feature warning for default granted permissions" into mnc-devSvet Ganov2015-07-065-8/+28
|\ \ \
| * | | Show basic feature warning for default granted permissionsSvet Ganov2015-07-035-8/+28
| |/ / | | | | | | | | | | | | | | | bug:22174223 Change-Id: Ic5c9a0ed9c17353145fff6e45483e92181fd9b86
* / / Reflect the proper permission group state in the UISvet Ganov2015-07-031-5/+5
|/ / | | | | | | | | | | | | | | | | A pemrission group is granted when at least one permission is granted as opposed to all permissions being granted. bug:22195416 Change-Id: I0bf7a8ec56380f89edc775a82c7f9d4f8e8f8245
* | Wire up "Additional Permissions" to TVTodd Volkert2015-07-011-17/+23
| | | | | | | | | | | | b/22045562 Change-Id: I5a0ade1190b6067cbdf3221acab81168466dafc8
* | Merge "Migrate package installer permissions fragments to preference support ↵Todd Volkert2015-07-018-131/+208
|\ \ | | | | | | | | | lib." into mnc-dev
| * | Migrate package installer permissions fragments to preference support lib.Todd Volkert2015-07-018-131/+208
| |/ | | | | | | | | | | | | | | | | | | | | | | In order to allow for TV-friendly layouts, this migrates the permissions fragments to the preference support lib, and modifies the necessary layouts and themes to make them work on TV. b/22043727 b/22045650 b/22044940 Change-Id: Ic862effe2c126da78c304983fd06e017c3ee4472
* / :Fix should show permission API back button behavior.Svetoslav2015-06-304-2/+26
|/ | | | | | | | | | Pressing the back button in the request permission dialog should be treated as a denial of the currently displayed permission. bug:22041240 Change-Id: I853d9ff5d3d10a29b2a5b1815de7de8b1c28cc6b
* Merge "Fix tinting on bitmap perm icons" into mnc-devJason Monk2015-06-251-1/+1
|\
| * Fix tinting on bitmap perm iconsJason Monk2015-06-241-1/+1
| | | | | | | | | | Bug: 22043511 Change-Id: I3d42ef243840a4cc2103c3f1d6a63e1c0ff940c9
* | Merge "Make ManagePermissionsFragment more TV-friendly." into mnc-devTodd Volkert2015-06-242-1/+50
|\ \
| * | Make ManagePermissionsFragment more TV-friendly.Todd Volkert2015-06-232-1/+50
| | | | | | | | | | | | | | | | | | b/22008424 Change-Id: Id780db5a1e8ec98aece484310a2d3799d868cf2e
* | | Merge "Fix issue #21945272: Crash in ↵Dianne Hackborn2015-06-231-8/+17
|\ \ \ | |/ / |/| | | | | Activity.dispatchRequestPermissionsResult" into mnc-dev
| * | Fix issue #21945272: Crash in Activity.dispatchRequestPermissionsResultDianne Hackborn2015-06-231-8/+17
| | | | | | | | | | | | | | | | | | Make sure to send a full result no matter how we finish the activity. Change-Id: Ic087a354053d0078985c33f6d1c77c9bb694dc62
* | | Merge "Use icon as background image instead of main image." into mnc-devTodd Volkert2015-06-231-1/+3
|\ \ \
| * | | Use icon as background image instead of main image.Todd Volkert2015-06-231-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | ImageView doesn't handle scaling vector drawables properly when they're set as the image of the image view. To get around this, we set the vector drawable as the background instead. b/22039991 Change-Id: Ibcabedea8cb999b31dabe9d78de4ae5214f588d6
* | | Merge "Mark permissions that are auto granted/revoked as policy_fixed" into ↵Amith Yamasani2015-06-233-0/+23
|\ \ \ | |/ / |/| | | | | mnc-dev
| * | Mark permissions that are auto granted/revoked as policy_fixedAmith Yamasani2015-06-233-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | Let PackageManager know that the permission state was changed by policy so that it can't be modified by the user anymore. Bug: 21888917 Change-Id: Idd09005515fac89fb1603b3aff0345a1f5e7bd79
* | | Merge "Only show the header on non-television ui modes." into mnc-devTodd Volkert2015-06-231-3/+7
|\ \ \ | |_|/ |/| |
| * | Only show the header on non-television ui modes.Todd Volkert2015-06-231-3/+7
| | | | | | | | | | | | | | | | | | b/22005468 Change-Id: Ia6d83596e0b5cc5d005d4322062e38dedede8d14
* | | Fix app count on App PermissionsMakoto Onuki2015-06-221-0/+1
| | | | | | | | | | | | | | | | | | Bug 21853051 Change-Id: I0ce4776f75c54d47bb0aa6f12419acc7bfd964ae
* | | Merge "Don't let preferences change size on load" into mnc-devJason Monk2015-06-221-0/+2
|\ \ \
| * | | Don't let preferences change size on loadJason Monk2015-06-221-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | Set a blank (non-empty) summary so that the size doesn't need to change when the summary is loaded. Bug: 21899351 Change-Id: I86d24d83461b3574d5c17b7b033303c498270a8a
* | | Merge "Use vertically stacked buttons when we don't have space" into mnc-devJason Monk2015-06-221-0/+5
|\ \ \ | |_|/ |/| |
| * | Use vertically stacked buttons when we don't have spaceJason Monk2015-06-221-0/+5
| |/ | | | | | | | | Bug: 21997648 Change-Id: I72a9952f0f6d4134cacb18d1cef92701770e6c9d
* / Add dialog guarding permission denial for system appsJason Monk2015-06-192-6/+14
|/ | | | | Bug: 20826933 Change-Id: I9915690611467d1d4e3d48e0d8590fccf2235b53
* Merge "Link from location permission to settings for loc providers" into mnc-devJason Monk2015-06-185-1/+106
|\
| * Link from location permission to settings for loc providersJason Monk2015-06-175-1/+106
| | | | | | | | | | Bug: 21805447 Change-Id: I27aed860b73d99976479793076852aecbf0be5a2
* | Merge "Add better logic for what is 'system'" into mnc-devJason Monk2015-06-185-14/+47
|\ \
| * | Add better logic for what is 'system'Jason Monk2015-06-185-14/+47
| |/ | | | | | | | | | | | | | | Match settings logic for this: System apps are on the system image, don't show up in launcher, and haven't been updated. Bug: 21849124 Change-Id: Ida77f98d080068731dcfd7aaf26aeb086fd681ed
* | Merge "Fix crash if show system is selected too soon" into mnc-devJason Monk2015-06-181-2/+4
|\ \
| * | Fix crash if show system is selected too soonJason Monk2015-06-181-2/+4
| |/ | | | | | | | | Bug: 21871042 Change-Id: I09bf33af37b00009aa935157a66b733826644116
* | Merge "Fix animating between very different heights" into mnc-devJason Monk2015-06-183-22/+82
|\ \
| * | Fix animating between very different heightsJason Monk2015-06-183-22/+82
| |/ | | | | | | | | | | | | | | | | | | | | | | | | - Expand ViewHeightController so it can expand up or down - Control the height of all containers in the hierarchy - Intercept touch events and compensate for any top offset on the root view, since we expand upwards - Remove the current description from the description container so that it can shrink in relayout if necessary. Bug: 21879037 Bug: 21784297 Change-Id: I3ad562158013b75c5e9150cbd91c96c6ff4941c9
* / Pass the right userHandle to AppPermissionGroupFyodor Kupolov2015-06-152-9/+11
|/ | | | | | | Previously, userHandle of the user associated with the context was always used. Bug: 21804306 Change-Id: If297a4c7b22abf43533b8ed67df0fd9b11c9b82e
* Merge "Permissions theme fixing" into mnc-devJason Monk2015-06-152-34/+48
|\
| * Permissions theme fixingJason Monk2015-06-122-34/+48
| | | | | | | | | | | | | | | | | | | | | | - Mostly just paddings a whatnot for preferences. - Also fix additional permissions screen (and its back arrow). - Keep ManagePermissions preferences around so that summary reloads aren't as painful on resume. Bug: 21636268 Bug: 21642971 Change-Id: Ibeb96ce63017c90fc37a661a6d82218b57371fb3
* | Merge "Fix wrong UID in app op toggle" into mnc-devSvet Ganov2015-06-141-4/+4
|\ \ | |/ |/|
| * Fix wrong UID in app op toggleSvet Ganov2015-06-131-4/+4
| | | | | | | | | | | | bug:21808330 Change-Id: I4f6f48085c71004b317223e7bd353f9f5f194462
* | Requesting granted permission shows grant/revoke UI.Svet Ganov2015-06-122-7/+10
|/ | | | | | bug:21565838 Change-Id: Ib878d07b7d9bbab1ffe2b64f008e2fe092ead253
* Use onBackPressed instead of onKeyDown/onKeyUpFyodor Kupolov2015-06-111-17/+3
| | | | Change-Id: I1a1b8f34b1625306daced4ff28a4ed389665be40