summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | 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 a4576744: (-s ours) am 0d1bcc6d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a45767446b89a047b8fc19e63604552ba1e7dc83': Import translations. DO NOT MERGE
| | * | | | | | am 0d1bcc6d: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d1bcc6d66a6014e9663d261bf3b47d35a9efc7a': Import translations. DO NOT MERGE
| * | | | | | | | am f482f773: Merge "Add enabled/disabled icons for permissions on Wear" into ↵Anthony Hugh2015-09-2586-3/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-e-dev * commit 'f482f77348c59cf64b66a21c2d8ae76d0ced2eb7': Add enabled/disabled icons for permissions on Wear
| | * | | | | | | 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 dff55b6e: (-s ours) am 8cb24434: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff55b6e5f55036e0b4891ba5185d363cb14fde1': Import translations. DO NOT MERGE
| | * | | | | | | | am 8cb24434: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8cb24434280f88b69dfb6944cd53c2a3e5eb28ec': Import translations. DO NOT MERGE
| * | | | | | | | | | am 0d0e466a: Fix CTS test by renaming button ids to matchAnthony Hugh2015-09-242-7/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0d0e466a67a4d73089286c4cb7ea7412cf193686': Fix CTS test by renaming button ids to match
| | * | | | | | | | | Fix CTS test by renaming button ids to matchAnthony Hugh2015-09-242-7/+7
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 24264373 Change-Id: I9f04ff68dcd11f48df9331abf2f1775c95f31f99
| * | | | | | | | | am 9d51c1e1: Merge "Add new dialog for warning confirmations" into cw-e-devAnthony Hugh2015-09-236-25/+156
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d51c1e17321029166d22f04bef57140905cbdc4': Add new dialog for warning confirmations
| | * | | | | | | | 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 c965cb21: (-s ours) am 6b760af9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c965cb21917b2dffec7ee5bb47ffa080cb482c1a': Import translations. DO NOT MERGE
| | * | | | | | | | am 6b760af9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b760af911ca546d3fc6386596f4d19e4a8387c9': Import translations. DO NOT MERGE
| * | | | | | | | | | am 639283b4: MNC Perms: Button bar animate to max half window heightVinod Krishnan2015-09-232-4/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '639283b4daf70b60e721d81a3404da7338cc6a41': MNC Perms: Button bar animate to max half window height
| | * | | | | | | | | 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
| * | | | | | | | | am fb9be671: Merge "Update Grant Permissions dialog to redlines" into cw-e-devAnthony Hugh2015-09-2215-79/+112
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb9be671c5293642b198c4ef06a94b33ff4ebc0b': Update Grant Permissions dialog to redlines
| | * | | | | | | | 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 c6a86e0a: (-s ours) am 7c7fa6b3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6a86e0a408bf991bd122592efb262e43a36ad94': Import translations. DO NOT MERGE
| | * | | | | | | | | am 7c7fa6b3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c7fa6b32e1e76764b5da43c715ba7a2c3c1a991': Import translations. DO NOT MERGE
| * | | | | | | | | | am 38e80af4: Fix "needs permissions" items iconsAnthony Hugh2015-09-181-3/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '38e80af4a571207b1c8cbe550b8e29479ea086a4': Fix "needs permissions" items icons
| | * | | | | | | | | Fix "needs permissions" items iconsAnthony Hugh2015-09-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provider string was incorrect after the port to PackageInstaller. BUG: 24006789 Change-Id: Id04785bb1a22169431db6d7df21071585d3fa1e0
| * | | | | | | | | | am 736c82ba: Permissions Settings UI updatesAnthony Hugh2015-09-176-54/+63
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '736c82ba577f8f972ea4277357ae440b192dcd13': Permissions Settings UI updates
| | * | | | | | | | | 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
| * | | | | | | | | | am 1a61dfd0: Add string for Wear version of permission "enforced by policy"Anthony Hugh2015-09-171-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a61dfd0af382e64ecd6ff91361036b22fcf52e9': Add string for Wear version of permission "enforced by policy"
| | * | | | | | | | | Add string for Wear version of permission "enforced by policy"Anthony Hugh2015-09-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8dce2d15903107fd7649068415bfa9bec8beae1c
| * | | | | | | | | | am eaa66124: Fix build breakAnthony Hugh2015-09-161-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaa6612490e571cb7cd6f090d027202f27ade74c': Fix build break
| | * | | | | | | | | Fix build breakAnthony Hugh2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another bad merge. Util was changed to isWear, not isWatch Change-Id: If15036edbb09114a17fd5993c145433b5c274ec8
| * | | | | | | | | | am fd755fe7: Merge "Build initial Permissions Settings UI page for Wear" ↵Erik Wolsheimer2015-09-167-2/+644
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cw-e-dev * commit 'fd755fe714ad8a29fac2ac7c1db1bbb65b28ef6d': Build initial Permissions Settings UI page for Wear
| | * | | | | | | | | 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
| * | | | | | | | | | | am 982f4b07: Fix build breakAnthony Hugh2015-09-161-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '982f4b072b2e74ecc06fbc0eeb69175999f0134c': Fix build break
| | * | | | | | | | | | Fix build breakAnthony Hugh2015-09-151-1/+2
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referenced wrong R Change-Id: Ic4157964a09dd65cada2efd5fc213bd3089b0b4a
| * | | | | | | | | | am fbe307f9: Merge "Permissions Watch settings UI port" into cw-e-devAnthony Hugh2015-09-1617-0/+2958
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbe307f9ee43b750ff8cae2658c1e0f03676da60': Permissions Watch settings UI port
| | * | | | | | | | | 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 e31ffee0: am b6e35d1c: am 30707bb7: Use unique preference key.Svet Ganov2015-09-152-8/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e31ffee066934ac4f8d66d0648c21be190a332c8': Use unique preference key.
| | * | | | | | | | | | am b6e35d1c: am 30707bb7: Use unique preference key.Svet Ganov2015-09-152-8/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6e35d1c5efeec22481f4912a7e422daad601fbc': Use unique preference key.
| * | | | | | | | | | | | am e9c8c7b2: Merge "Add an API for getting list of all apps that have ↵Vinod Krishnan2015-09-143-21/+78
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runtime perms" into cw-e-dev * commit 'e9c8c7b2942514e566cd02fbf58cb31ab917a72d': Add an API for getting list of all apps that have runtime perms
| | * | | | | | | | | | | 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
| * | | | | | | | | | | | am 03dc824d: Changing layout to make button animations workVinod Krishnan2015-09-1416-91/+276
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03dc824d37099b29acb5a0aa28e881d5b05cce0e': Changing layout to make button animations work
| | * | | | | | | | | | | 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
| * | | | | | | | | | | am 46fed54b: Redo Move ClockworkPackageInstaller functionality here"Vinod Krishnan2015-09-095-0/+988
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46fed54b3ee49e4bebabca50bcff5bceaece96b8': Redo Move ClockworkPackageInstaller functionality here"
| | * | | | | | | | | | Redo Move ClockworkPackageInstaller functionality here"Vinod Krishnan2015-09-095-0/+988
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5b26c2e64ceeaa1e71436b36a28f53100e358ed8. Change-Id: I88fa09f87023a7c1b2aac3100cfbdce6283de770
| * | | | | | | | | | | am 5b26c2e6: Revert "Move ClockworkPackageInstaller functionality here"Griff Hazen2015-09-085-988/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b26c2e64ceeaa1e71436b36a28f53100e358ed8': Revert "Move ClockworkPackageInstaller functionality here"
| | * | | | | | | | | | Revert "Move ClockworkPackageInstaller functionality here"Griff Hazen2015-09-085-988/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breaking ub-wear-dinar/ub-wear-master builds This reverts commit aa4368cafc3c92b33a99c3fbe0e6af08d7e092e4. Change-Id: Ib22189891e9cd9eef61cdaa5ac329d05ab9783e8