summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | 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-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 234675e271 -s ours * commit '234675e271f860280c6f7b8a0cc554880582c7b1': Import translations. DO NOT MERGE
| | * | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 51f646b19d * commit '51f646b19dfbe663fcd2ea78d10fd2813c4d20f8': Reduce the top padding when message isn't at top.
| | * | | 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
| * | | | Merge branch 'mnc-ub-dev' of ↵Danny Epstein2015-10-200-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/PackageInstaller into mnc-ub-dev
| | * | | | Add top padding to grant permission content.Danny Epstein2015-10-204-2/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dc40bd77b1 * commit 'dc40bd77b1ab709de9d705c88f56ff61d618ed5c': Add top padding to grant permission content.
| * | | | | Add top padding to grant permission content.Danny Epstein2015-10-204-2/+5
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | am: dc40bd77b1 * commit 'dc40bd77b1ab709de9d705c88f56ff61d618ed5c': Add top padding to grant permission content.
| | * | | 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 16bd317a: am 6986f29b: Auto grant permissions in an already granted group.Svetoslav Ganov2015-10-151-2/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '16bd317af077269cdb5604d631fdeef051faf865': Auto grant permissions in an already granted group.
| | * | | 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.
| * | | | am 7307dc71: am 86f1ee8c: Revert "Auto grant permissions in an already ↵Ian Pedowitz2015-10-151-18/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | granted group." * commit '7307dc71a7897b88135ed72dc85f64e4658a8ac6': Revert "Auto grant permissions in an already granted group."
| | * | | 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."
| * | | | | am d6d07416: am c7e595a2: Auto grant permissions in an already granted group.Svetoslav2015-10-151-2/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd6d074169d960647ac275a8a05a873a9993d6b09': Auto grant permissions in an already granted group.
| | * | | | 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.
| * | | | | | am adf405b0: Merge "MNC Perms: Missed some cases for package installation" ↵Vinod Krishnan2015-10-131-48/+64
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cw-e-dev * commit 'adf405b0881079ef6518c1a04af7d302fbfae29b': MNC Perms: Missed some cases for package installation
| | * | | | | 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
| * | | | | | | am 0e3c7dbd: Modifies wear Permission title height to avoid clippingAlex Hills2015-10-132-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e3c7dbdfc98fb9e79c4b2564be3fbade8896acf': Modifies wear Permission title height to avoid clipping
| | * | | | | | 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
| * | | | | | am 6a576288: Permissions redline fixesAnthony Hugh2015-10-0511-60/+181
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a5762884adc64ea95bd206c46d60031428e977c': Permissions redline fixes
| | * | | | | 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
| * | | | | | am 12c698b4: Merge "Block Install Intent for Wear devices" into cw-e-devVinod Krishnan2015-10-014-2/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12c698b4d2d75895c72bc900ed363acd03c94bfe': Block Install Intent for Wear devices
| | * | | | | 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