summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | No overlay when permissions shown - package installerSvet Ganov2016-02-208-46/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a NPE in GrantPermissionsActivitySvet Ganov2016-02-201-5/+6
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Show support dialog when admin disallows installs from unknown sources...Sudheer Shanka2016-02-091-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Show support dialog when admin disallows installs from unknown sources.Sudheer Shanka2016-02-081-2/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2016-02-083-8/+8
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-031-3/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 8c28b97fbc -s...Geoff Mendal2016-02-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2016-02-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 6f23a1b1bb -s ours am: 7b6e0bbc72 -s ...Geoff Mendal2016-02-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 6f23a1b1bb -s oursGeoff Mendal2016-02-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-024-13/+13
* | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-01-251-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Make the permission request dialog\'s layout robust" am: bd0d2c00d4 -...Svetoslav Ganov2016-01-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Make the permission request dialog\'s layout robust"Svetoslav Ganov2016-01-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Make the permission request dialog's layout robustSvetoslav Ganov2016-01-215-294/+208
* | | | | | | | | | | | | | | | | | | | | | | | | Merge -s ours commit \'f8f62986b4\' into mnc-dr2-dev-plus-aospStephen Li2016-01-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make the permission request dialog\'s layout robust" am: 544b33105d -...Svetoslav Ganov2016-01-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Make the permission request dialog\'s layout robust"Svetoslav Ganov2016-01-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Make the permission request dialog's layout robust"Svetoslav Ganov2016-01-205-302/+231
| | |\| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Make the permission request dialog's layout robustSvet Ganov2016-01-175-302/+231
| | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2016-01-201-9/+9
| |_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Make request permissions dialog layout robost"" am: 41d260fe98Svetoslav Ganov2016-01-153-35/+6
|\| | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Make request permissions dialog layout robost""Svetoslav Ganov2016-01-153-35/+6
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Revert "Make request permissions dialog layout robost""Svetoslav Ganov2016-01-153-35/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Revert "Make request permissions dialog layout robost"Brian Carlstrom2016-01-143-35/+6
| | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Improve untrusted sources UX for app side-loading" am: c23d802958Svetoslav Ganov2016-01-151-6/+17
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Improve untrusted sources UX for app side-loading"Svetoslav Ganov2016-01-151-6/+17
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Improve untrusted sources UX for app side-loading"Svetoslav Ganov2016-01-151-6/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Improve untrusted sources UX for app side-loadingSvetoslav Ganov2016-01-141-6/+17
* | | | | | | | | | | | | | | | | | | | | | | Merge "Make request permissions dialog layout robost" am: 816baf3566Svetoslav Ganov2016-01-153-6/+35
|\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Make request permissions dialog layout robost"Svetoslav Ganov2016-01-153-6/+35
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Make request permissions dialog layout robost"Svetoslav Ganov2016-01-153-6/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Make request permissions dialog layout robostSvet Ganov2016-01-133-6/+35
* | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 4e5cd3a5b2 -s ours am: 75a02b59f7 -s ...Geoff Mendal2016-01-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |