summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2016-03-0979-316/+158
| | | | | Change-Id: I396361b52187a01ce702759c154e771f34228489 Auto-generated-cl: translation import
* 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
* | No overlay when permissions shown - package installerSvet Ganov2016-02-208-46/+18
| | | | | | | | | | | | bug:26973205 Change-Id: Ibae1b971ceb1ea0d831435b9d5166482199e9184
* | Fix a NPE in GrantPermissionsActivitySvet Ganov2016-02-201-5/+6
|/ | | | | | | | | We get an NPE if an app that delcates no permissions as used requests runtime permissions. bug:21011604 Change-Id: Id0cac6dcbd78ef849a1eafa522b8a06e61b21a1b
* Merge "Show support dialog when admin disallows installs from unknown ↵Sudheer Shanka2016-02-091-2/+4
|\ | | | | | | sources." into nyc-dev
| * Show support dialog when admin disallows installs from unknown sources.Sudheer Shanka2016-02-081-2/+4
| | | | | | | | | | Bug: 26737249 Change-Id: I2a58b2eae34319ecc51ffc42078ed0cfe2460c60
* | Import translations. DO NOT MERGEGeoff Mendal2016-02-083-8/+8
|/ | | | | Change-Id: Idcdbbb60d502b83ccca1139bea6a9b3e0fc12c85 Auto-generated-cl: translation import
* Merge "Use the correct userId when checking if disabled by admin."Sudheer Shanka2016-02-044-8/+17
|\
| * Use the correct userId when checking if disabled by admin.Sudheer Shanka2016-02-014-8/+17
| | | | | | | | Change-Id: I0fbe8ac8670b9fa4eb1fa35693856b47fdc974a4
* | Import translations. DO NOT MERGEGeoff Mendal2016-02-031-3/+3
| | | | | | | | | | Change-Id: I4a4a82453031340bd8f53b6421716e22679810d5 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 8c28b97fbc ↵Geoff Mendal2016-02-030-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 05019e39b9 -s ours * commit '05019e39b918b1de25e38c21a7ac40c77af6956b': Import translations. DO NOT MERGE
| * \ Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2016-02-030-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 8c28b97fbc -s ours * commit '8c28b97fbca6f2eae0cc40c32f4d8f0ea15e36dd': Import translations. DO NOT MERGE
| | * \ Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2016-02-034-13/+13
| | |\ \
| | | * | Import translations. DO NOT MERGEGeoff Mendal2016-02-034-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie5bd09c73ed04617d940db8e450bd3632cde6248 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGE am: 6f23a1b1bb -s ours am: 7b6e0bbc72 -s ↵Geoff Mendal2016-02-030-0/+0
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 94cf00bd8f -s ours * commit '94cf00bd8fcd304f5b3cb7f775c8f6ac5f91525a': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGE am: 6f23a1b1bb -s oursGeoff Mendal2016-02-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 7b6e0bbc72 -s ours * commit '7b6e0bbc72420771baf991b338c71b8a57488ea9': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2016-02-020-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | am: 6f23a1b1bb -s ours * commit '6f23a1b1bbb07f08ec56ec1d854c703758c56368': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2016-02-024-13/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I5dcf6d21c571f1f533a12961f3bab65efe8b02f7 Auto-generated-cl: translation import
* | | | Merge "Update the summary used when permission is fixed by admin."Sudheer Shanka2016-01-282-4/+7
|\ \ \ \
| * | | | Update the summary used when permission is fixed by admin.Sudheer Shanka2016-01-262-4/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I427fd1e1c99153484944ee9955ae79ee9e2c23ef
* | | | | Import translations. DO NOT MERGEGeoff Mendal2016-01-251-1/+1
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I1c4779cd5471011950871feb5daa079ece9f0b4b Auto-generated-cl: translation import
* | | | Merge "Add a padlock to options when disabled by admin."Sudheer Shanka2016-01-215-8/+115
|\ \ \ \
| * | | | Add a padlock to options when disabled by admin.Sudheer Shanka2016-01-205-8/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if admin has enforced setPermissionGrantState to denied or granted, we disable the option and add a summary that the option is disabled by admin. With this change, a padlock will also be added in this case. Change-Id: I58080c914fabab045282eb3cc491901676fffaed
* | | | | Merge "Make the permission request dialog\'s layout robust" am: bd0d2c00d4 ↵Svetoslav Ganov2016-01-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 696c882072 * commit '696c8820726c6041995d02c6ec377b93840be524': Make the permission request dialog's layout robust
| * | | | Merge "Make the permission request dialog\'s layout robust"Svetoslav Ganov2016-01-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bd0d2c00d4 -s ours * commit 'bd0d2c00d4e1fcd558fc8dde3c72267c293e3c7e': Make the permission request dialog's layout robust
| | * \ \ \ Merge "Make the permission request dialog's layout robust"Svetoslav Ganov2016-01-215-302/+229
| | |\ \ \ \
| | | * | | | Make the permission request dialog's layout robustSvetoslav Ganov2016-01-205-302/+229
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old implementation was relying on a fixed window size where the content is positioned by a custom layout manager. It is possible however that subsequent permissions requests do not fit in the window as its size is computed based on the content of the first permissions request. There were also cases where the content is chopped after a rotation as the dialog size width was not re-evaluated while it should be. Further, animation from one permission request state to another was not properly done resulting in content being chopped off in some cases. The current approach is to have a dialog width for the content activity but the height is as tall as the screen allowing us to fit arbitrary large permission request content. Also we are resetting the fixed width on a configuration change so the dialog is robust to adjust size as needed. bug:24679384 bug:25755378 Change-Id: I4d23f81d8e59ce23bf9a27155ebb5ec6e2e6752c
* | | | | | Merge "resolve merge conflicts of 9199155a7f to master."Svetoslav Ganov2016-01-215-293/+208
|\ \ \ \ \ \
| * | | | | | resolve merge conflicts of 9199155a7f to master.Svetoslav Ganov2016-01-205-301/+187
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I325541269f5a0f7c1fde7a57042543e769bed218
| | * | | | | Make the permission request dialog's layout robustSvetoslav Ganov2016-01-215-294/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old implementation was relying on a fixed window size where the content is positioned by a custom layout manager. It is possible however that subsequent permissions requests do not fit in the window as its size is computed based on the content of the first permissions request. There were also cases where the content is chopped after a rotation as the dialog size width was not re-evaluated while it should be. Further, animation from one permission request state to another was not properly done resulting in content being chopped off in some cases. The current approach is to have a dialog width for the content activity but the height is as tall as the screen allowing us to fit arbitrary large permission request content. Also we are resetting the fixed width on a configuration change so the dialog is robust to adjust size as needed. bug:24679384 bug:25755378 Change-Id: I4d23f81d8e59ce23bf9a27155ebb5ec6e2e6752c (cherry picked from commit c6dc4bb52b07886346b02b326c5c32a8299ed73e)
* | | | | | | Merge -s ours commit \'f8f62986b4\' into mnc-dr2-dev-plus-aospStephen Li2016-01-210-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6e1457c742 * commit '6e1457c742294d9886b8b650b0e9db494a3d7139': Revert "Make the permission request dialog's layout robust"
| * | | | | | Merge -s ours commit 'f8f62986b4' into mnc-dr2-dev-plus-aospStephen Li2016-01-200-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Revert "Make the permission request dialog's layout robust""Svetoslav Ganov2016-01-205-231/+302
| | |\ \ \ \ \
| | | * | | | | Revert "Make the permission request dialog's layout robust"Svetoslav Ganov2016-01-205-231/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7b8c46812eb71cf12d20062619ec1fab438e7d13. Change-Id: I86f8a5a75102350060c4fa3ba903260683e921c6
* | | | | | | | Merge "Make the permission request dialog\'s layout robust" am: 544b33105d ↵Svetoslav Ganov2016-01-210-0/+0
|\| | | | | | | | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: f2f629cd52 * commit 'f2f629cd52b8dc669f776e46e7c5ff889de841d4': Make the permission request dialog's layout robust
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 10:06:29 +0000