summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-080-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-060-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-030-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-020-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-230-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-210-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-100-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-070-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-040-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | |/ | | | | | | | | | | |/|
| | | | | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2016-02-010-0/+0
| | | | | | | | | | |\|
| | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-260-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-240-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-210-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-170-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-140-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-070-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-060-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-050-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-240-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-220-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-170-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / | Import translations. DO NOT MERGEGeoff Mendal2016-03-0780-183/+452
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I37168273324f9bed34bd85425a0be69825b54832 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Support app install from a content URI" into nyc-devSvetoslav Ganov2016-03-0621-90/+254
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support app install from a content URISvet Ganov2016-03-0521-90/+254
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:24079113 Change-Id: Ide1aa1667370f6b8d00ff269ef28992589656e9a
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update restricted icon position in RestrictedSwitchPreference." into ↵Sudheer Shanka2016-03-032-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-dev
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update restricted icon position in RestrictedSwitchPreference.Sudheer Shanka2016-03-022-6/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fixed a bug where the admin disabled summary is shown even if the admin has not set a permission policy. Bug: 25603665 Bug: 27263775 Change-Id: I8cbbc4c326669a656ad5aef53896b388d556a74f
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix confirm button text when revoking special permissons" into nyc-devSvetoslav Ganov2016-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix confirm button text when revoking special permissonsSvet Ganov2016-03-021-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23899558 Change-Id: Ic40994d5a74f726d0a7bc5f0f476b62f114fd18f
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-03-0280-102/+281
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c8b57174dd1580196bda7bbfff6e9a46d23178e Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use safe label in permission request UI" into nyc-devSvetoslav Ganov2016-03-011-23/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use safe label in permission request UISvetoslav Ganov2016-03-011-23/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23531798 Change-Id: I7cde3b9987c0e59b9aa148a5a3a597eec55a20a4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix buildSvetoslav Ganov2016-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8ad80e9e31862397d7f532cd2998bd246cd40c0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename don't ask again button per UX specSvetoslav Ganov2016-03-011-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23719904 Change-Id: I48b1ea8c50d0d1695254d6c8f96008a0ec59c343
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Expose removed permissions flag as system API - installer" into nyc-devSvetoslav Ganov2016-02-235-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose removed permissions flag as system API - installerSvet Ganov2016-02-225-6/+5
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some permissions that were removed from the platform and guard nothing but legacy apps may be checking them before calling APIs. Hence, these apps should get the permissions as expected despite them being a no-op. To address this the platform declares removed permissions as normal permissions that are hidden such that legacy apps can always get them. These permissions are not shown in the UI. Play needs a way to filter out these permissions like the platform as they have permissions UI too. bug:23361760 Change-Id: Ieecf69f70551d987f5fac1f128b7f7a0c242c378
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Show permissions grant UI in requested order" into nyc-devSvetoslav Ganov2016-02-231-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Show permissions grant UI in requested orderSvet Ganov2016-02-221-6/+6
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23314383 Change-Id: I4b41b9941f147eefc5f3fc2c520aba7afabd26a0