summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make GrantPermissions dialog not swipable on WatchAnthony Hugh2015-10-271-0/+1
| | | | | BUG: 24672088 Change-Id: I872b41684c741868dfb9eeed68d40cb983dcf139
* Import translations. DO NOT MERGEGeoff Mendal2015-10-2678-313/+339
| | | | | Change-Id: Ia1f4187fa3f4c1cb9d87e3d936b0e7abd858562d Auto-generated-cl: translation import
* Fix Permissions Dialog animationsAnthony Hugh2015-10-211-4/+36
| | | | | | | | | Make handler run on UI thread to avoid race conditions. Update some logic to prevent animation from running when it shouldn't be. BUG: 24954323 Change-Id: Ia1635cbb3c9128080a8e4a9c3ce6ee935c4d957e
* Import translations. DO NOT MERGEGeoff Mendal2015-10-2197-39/+177
| | | | | Change-Id: I8d4ddb52214ff84123e65e955d29d82ca3536d4f Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-10-21156-434/+3296
| | | | | Change-Id: Ic7e8f862a3048151784ae6ce6cb3c228ef6cf059 Auto-generated-cl: translation import
* Reduce the top padding when message isn't at top.Danny Epstein2015-10-204-15/+27
| | | | | | | | If either the page number or an icon is shown above the message, reduce the top padding on round screens. Bug: 24961379 Change-Id: Iec9193e3bbdd8ac607743cd0010f2331edbebc81
* Add top padding to grant permission content.Danny Epstein2015-10-194-2/+5
| | | | | | | | | Add top padding to the content inside the scroll view for the grant permission dialog so that you can read the beginning of the text on round watches. Bug: 24961379 Change-Id: I9311fbaabd72bd8f8aee4f71845c1ae11bfeab8c
* am 6986f29b: Auto grant permissions in an already granted group.Svetoslav Ganov2015-10-151-2/+18
|\ | | | | | | | | * commit '6986f29bb93a6aaaeaaddcab081d0e0afd7082e8': Auto grant permissions in an already granted group.
| * Auto grant permissions in an already granted group.Svetoslav Ganov2015-10-151-2/+18
| | | | | | | | | | | | bug:24074183 Change-Id: Iad6f9b7d5b83d0b0121796891bcd069658995a47
* | am 86f1ee8c: Revert "Auto grant permissions in an already granted group."Ian Pedowitz2015-10-151-18/+2
|\| | | | | | | | | * commit '86f1ee8c2db04d37d48f25a60086e5a27a812fb9': Revert "Auto grant permissions in an already granted group."
| * Revert "Auto grant permissions in an already granted group."Ian Pedowitz2015-10-151-18/+2
| | | | | | | | | | | | This reverts commit c7e595a22c11247b3e6b0fbfa324542321ab9d14. Change-Id: I0a319ef590e9c0f830af470155213677bed684f4
* | am c7e595a2: Auto grant permissions in an already granted group.Svetoslav2015-10-151-2/+18
|\| | | | | | | | | * commit 'c7e595a22c11247b3e6b0fbfa324542321ab9d14': Auto grant permissions in an already granted group.
| * Auto grant permissions in an already granted group.Svetoslav2015-10-151-2/+18
| | | | | | | | | | | | | | bug:24074183 Change-Id: I8eb4e4c76ed27721b04e09ae009ddd2daec1e0b1 (cherry picked from commit ecc46fe0ce772338786cb9e23cb872189e6a285c)
* | Merge "MNC Perms: Missed some cases for package installation" into cw-e-devVinod Krishnan2015-10-131-48/+64
|\ \
| * | MNC Perms: Missed some cases for package installationVinod Krishnan2015-10-131-48/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If {Companion App was targeting M, Companion was running L, watch is running M, watch app is targeting M}, we were not installing the app before this fix. - If {Companion App was targeting M, Companion was running M, watch is running M, watch app is targeting M}, we were not installing the app before this fix. Bug: 24813602 Bug: 23378733 Change-Id: I96f06adad2372517e57467d4af8d87dcb6068445
* | | Modifies wear Permission title height to avoid clippingAlex Hills2015-10-132-2/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | We were explicitly setting the height of the permission screen title, which wasn't 100% guaranteed to work in all languages. This change sets minHeight (to maintain UI consistency) instead, and changes the height to wrap_content to enable it to expand further if necessary. Bug:24774285 Bug:24391658 Change-Id: Icf25ad6a176537b0f34a30f53220c73fccec2d24
* | Permissions redline fixesAnthony Hugh2015-10-0511-60/+181
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the button bar animation to work on round devices and also fixes the max height animation to make sure the vertical button layout animates to max height when there are only two buttons. Also adjust some redlines like margins on the buttons and updated some files that were missing our licensing header. Change-Id: Ifad4d0f92605be04db2d3c991b4e8a26eadb4b14
* | Merge "Block Install Intent for Wear devices" into cw-e-devVinod Krishnan2015-10-014-2/+34
|\ \
| * | Block Install Intent for Wear devicesVinod Krishnan2015-09-284-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We did not support this feature on Android Wear before - The impact is unknown. For example, the Setting for UNKNOWN_SOURCES is not implemented in Android Wear Settings App. Bug: 24336381 Change-Id: I0fb4006d4769291c872e8f21407383a7c4a77b93
* | | am 0d1bcc6d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
|\ \ \ | | |/ | |/| | | | | | | * commit '0d1bcc6d66a6014e9663d261bf3b47d35a9efc7a': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2015-09-266-6/+6
| | | | | | | | | | | | | | | Change-Id: Iac8fea6ecd14c93ad3a65bddcbf54bd57b5f3edb Auto-generated-cl: translation import
* | | Merge "Add enabled/disabled icons for permissions on Wear" into cw-e-devAnthony Hugh2015-09-2586-3/+50
|\ \ \
| * | | Add enabled/disabled icons for permissions on WearAnthony Hugh2015-09-2386-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds proper enabled/disabled icons for permissions on Wear and adds the logic to flip between the two states when the permissions are toggled. BUG: 24132450 BUG: 24131441 BUG: 24277624 BUG: 24131983 Change-Id: Ie654c84fe3d648e47a76142a6f82c4348bb7fc0c
* | | | am 8cb24434: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '8cb24434280f88b69dfb6944cd53c2a3e5eb28ec': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEBaligh Uddin2015-09-2415-15/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I7030773f4877eeedfabfa2944ad521dcd642dc44 Auto-generated-cl: translation import
* | | | Fix CTS test by renaming button ids to matchAnthony Hugh2015-09-242-7/+7
| |/ / |/| | | | | | | | | | | BUG: 24264373 Change-Id: I9f04ff68dcd11f48df9331abf2f1775c95f31f99
* | | Merge "Add new dialog for warning confirmations" into cw-e-devAnthony Hugh2015-09-236-25/+156
|\ \ \ | |_|/ |/| |
| * | Add new dialog for warning confirmationsAnthony Hugh2015-09-236-25/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates the Wear warning dialog for when users try to change permissions for system apps and apps that are targeting old SDKs. Because Wear does not have a common dialog yet, I needed to create a new activity to hold our confirmation view. Changes: - Update logic to show Wear confirmation screen instead of using AlertDialog - Added WarningConfirmationActivity - Change font size for confirmation dialog - Make ConfirmationViewHandler support hiding one of the 3 vertical buttons - rename grant_permissions.xml to more generic confirmation_dialog BUG: 24132857 Change-Id: Id225e663f0a2cd7b99fb177f780a6a3d0da15214
* | | am 6b760af9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
|\ \ \ | | |/ | |/| | | | | | | * commit '6b760af911ca546d3fc6386596f4d19e4a8387c9': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2015-09-232-2/+2
| | | | | | | | | | | | | | | Change-Id: I7f01780fab616943d750a08e469417f3b863aea3 Auto-generated-cl: translation import
* | | MNC Perms: Button bar animate to max half window heightVinod Krishnan2015-09-222-4/+10
| |/ |/| | | | | | | | | | | | | | | | | - Make sure that the button bar only animates to half way (max). - Also make the buttons scrollable Bug: 24265941 Bug: 24208967 Change-Id: I68d01c72658c0e7aff35b899b638da123c44d62e
* | Merge "Update Grant Permissions dialog to redlines" into cw-e-devAnthony Hugh2015-09-2215-79/+112
|\ \
| * | Update Grant Permissions dialog to redlinesAnthony Hugh2015-09-2215-79/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Refactor the ViewHandler a bit to be more generic. This should help with another upcoming Wear dialog. - Update assets for buttons - Add deny asset - Fix margins and other UI number tweaks BUG: 24133550 Change-Id: I330bdf3217fa5c554f71d9105a0475106b6f3e12
* | | am 7c7fa6b3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '7c7fa6b32e1e76764b5da43c715ba7a2c3c1a991': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEBaligh Uddin2015-09-183-21/+21
| | | | | | | | | | Change-Id: Iea7f275f9286026954665f0d228d13bcda62d110 Auto-generated-cl: translation import
* | Fix "needs permissions" items iconsAnthony Hugh2015-09-171-3/+1
| | | | | | | | | | | | | | Provider string was incorrect after the port to PackageInstaller. BUG: 24006789 Change-Id: Id04785bb1a22169431db6d7df21071585d3fa1e0
* | Permissions Settings UI updatesAnthony Hugh2015-09-176-54/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Moved non-system permission groups to the end of the list - Updated "disabled" look to match non-center looked - Fixed state string alpha to match other alphas when not centered - Minor code clean ups BUG: 24132393 BUG: 24132470 BUG: 24131983 Change-Id: I65a64d59e6fff8e0cbdaaa3da4e4a79987d6e624
* | Add string for Wear version of permission "enforced by policy"Anthony Hugh2015-09-161-0/+3
| | | | | | | | Change-Id: I8dce2d15903107fd7649068415bfa9bec8beae1c
* | Fix build breakAnthony Hugh2015-09-161-1/+1
| | | | | | | | | | | | Another bad merge. Util was changed to isWear, not isWatch Change-Id: If15036edbb09114a17fd5993c145433b5c274ec8
* | Merge "Build initial Permissions Settings UI page for Wear" into cw-e-devErik Wolsheimer2015-09-167-2/+644
|\ \
| * | Build initial Permissions Settings UI page for WearAnthony Hugh2015-09-157-3/+644
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a first pass to build a functional settings UI page for Permissions on Android Wear. The user flow is a little different than the phone version, so there are some nuances that need to be adjusted from the normal flow. I have forked off of the AppPermissionsFragment and created a Wear version for us to use. Rather than try to link the Wearable-Support lib into AOSP code, I have made a duplicate of the few files I needed. This change adds a Wear layout version of the Settings UI page. The UI is fully functional for most cases, but there are some tweaks still needed for full parity. The tweaks are primarily around UI and special edge case functions. BUG: 23080561 Change-Id: I8477f6b966cacaae9e77aa0fb61b4b1e621a9ead
* | | Fix build breakAnthony Hugh2015-09-151-1/+2
|/ / | | | | | | | | | | Referenced wrong R Change-Id: Ic4157964a09dd65cada2efd5fc213bd3089b0b4a
* | Merge "Permissions Watch settings UI port" into cw-e-devAnthony Hugh2015-09-1617-0/+2958
|\ \
| * | Permissions Watch settings UI portAnthony Hugh2015-09-1517-0/+2958
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL contains all the UI elements needed to build the Wear version of the Settings UI for permissions. The actual implementation for the Wear version of SettingsUI will be done in a follow up bug. This is basically a straight port from our Settings app and wearable-support lib. I tweaked two strings and changed the package paths to make it easier to group the files together. BUG: 23080561 Change-Id: I6d72d29dd1926ad07d63f85b52ccf9f72ff70df1
* | | am b6e35d1c: am 30707bb7: Use unique preference key.Svet Ganov2015-09-152-8/+8
|\ \ \ | | |/ | |/| | | | | | | * commit 'b6e35d1c5efeec22481f4912a7e422daad601fbc': Use unique preference key.
| * | am 30707bb7: Use unique preference key.Svet Ganov2015-09-152-8/+8
| |\ \ | | | | | | | | | | | | | | | | * commit '30707bb7a27157d5124b0c648509c0e63d1da392': Use unique preference key.
| | * | Use unique preference key.Svet Ganov2015-09-122-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UI code was wrongly using UID as the key - it is not unique - resulting in keeping only one app per UID in the UI and not showing permission controls for the other apps in this UID. This change uses the unique package plus UID as the preference key. bug:23937944 Change-Id: I859afcf3ec8efdcb62d0e9dacd19f771436da084
* | | | Merge "Add an API for getting list of all apps that have runtime perms" into ↵Vinod Krishnan2015-09-143-21/+78
|\ \ \ \ | | | | | | | | | | | | | | | cw-e-dev
| * | | | Add an API for getting list of all apps that have runtime permsVinod Krishnan2015-09-143-21/+78
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23819535 - Used for Android Wear Change-Id: Ie42ce04453cb0cd7d2cf292065bbb1891fffbfa9
* / | | Changing layout to make button animations workVinod Krishnan2015-09-1416-91/+276
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix the Permissions Dialogs for round layout - Show animation for the buttons - Also fixed the names ellipsis issue. - Fixed the theming of the dialogs. Bug: 23118402 Change-Id: I385c827ac41b06222334c36bfda2c70b346232a2