summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Fix build break.Sharvil Nanavati2015-11-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 741ac03b43 -s ours * commit '741ac03b4367c06d33190b80e2f6a6003a803517': Fix build break.
| | * | | | Fix build break.Sharvil Nanavati2015-11-212-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25822682 Change-Id: Ib5b40f014a8b6d0fb756d7f4c4802c9e8dfa7a44
| * | | | | Fix buildSvetoslav2015-11-205-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a3e235bb13f1920c14f6776ee3a1ef7285ea548
| * | | | | resolve merge conflicts of c10abb25f3 to cw-e-dev.Svetoslav2015-11-203-274/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c3d14f58d8 * commit 'c3d14f58d80cc5ed8b60ee1782d38643c08734e7': Clean up package installer styling
| | * | | | resolve merge conflicts of c10abb25f3 to cw-e-dev.Svetoslav2015-11-203-274/+3
| | |\| | | | | | | | | | | | | | | | | | | | | Change-Id: I965fb579e2730fa1cdb182bc18e134f262929328
| | | * | | Clean up package installer stylingSvetoslav2015-11-2039-157/+1918
| | | |\| | | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | am: 2cf17ddcef * commit '2cf17ddcef3c8dd260bd3d174123842c81a7d025': Clean up package installer styling
| | | | * Clean up package installer stylingSvetoslav2015-11-1839-157/+1918
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package installer should be using exclusively the device defaut themes on handhelds (phones and tables) to allow OEMs customize its look and feel. Also for handhelds the installer should use the same preference framework as the settings app to ensure it looks like the settings app on an OEMs device. This change needs to be picked up by a GMS build to deliver to partners ensuring the installer UI is consistent with the device UI. bug:24286616 Change-Id: I92e39fd1488e76b0b23b7f1efa13e04ed5bbc7ba
| * | | | resolve merge conflicts of c10abb25f3 to cw-e-dev.Svetoslav2015-11-2039-155/+2185
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ef861375ee * commit 'ef861375eebd9ac6cce7c0bb163380ab1c951063': resolve merge conflicts of c10abb25f3 to cw-e-dev.
| | * | | resolve merge conflicts of c10abb25f3 to cw-e-dev.Svetoslav2015-11-2039-155/+2185
| | | | | | | | | | | | | | | | | | | | Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
| * | | | Remove app from "needs permission" state if installation failedAnthony Hugh2015-11-162-7/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9c78316fe6 * commit '9c78316fe6baa4f7fd7d5108349ecf8a2532b047': Remove app from "needs permission" state if installation failed
| | * | | Remove app from "needs permission" state if installation failedAnthony Hugh2015-11-162-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds code to remove an app that is in the "needs permission" state from the ShowPermStore if the app fails to install. b/25721625 tracks creating a new intent to handle this case for F. BUG: 25363020 Change-Id: Ifed00024d7e329fb3185a4607a347e972f697fcd
| * | | | resolve merge conflicts of e8c6801367 to cw-e-dev.Vinod Krishnan2015-11-071-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 012a557f59 * commit '012a557f593bd2862756839eeade4b892b05422e': resolve merge conflicts of e8c6801367 to cw-e-dev.
| | * | | resolve merge conflicts of e8c6801367 to cw-e-dev.Vinod Krishnan2015-11-071-1/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I9c5a0be4e18cc27e163da60ba9dd81ae71588bef
| * | | | Button bar animating when it isn\'t supposed toAnthony Hugh2015-11-031-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 914243ab7d * commit '914243ab7dd019daa1ae8fcbb538142555597acd': Button bar animating when it isn't supposed to
| | * | | Button bar animating when it isn't supposed toAnthony Hugh2015-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an incorrect calculation for determining when the content was occluded by the button bar or not. BUG: 25164689 Change-Id: I121f6e0232da2d1536e0fbbf697e00a4f9c1841f
| * | | | Merge "Add mechanism for determining if apps are system apps" into cw-e-devAnthony Hugh2015-10-302-3/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ae6139679d * commit 'ae6139679d31e52f74aa9d6ceb40f952f14f6022': Add mechanism for determining if apps are system apps
| | * | | Merge "Add mechanism for determining if apps are system apps" into cw-e-devAnthony Hugh2015-10-302-3/+26
| | |\ \ \
| | | * | | Add mechanism for determining if apps are system appsAnthony Hugh2015-10-272-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is being added to help identify system apps so that the UI can filter on that type. BUG: 24955055 Change-Id: I8d843bae2d81329009c8cda8c25355d08ab9d1d7
| * | | | | Fix out of bounds exceptionAnthony Hugh2015-10-302-11/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e18bfc2201 * commit 'e18bfc22019f44ae60674fc6d34616ce097e05f4': Fix out of bounds exception
| | * | | | Fix out of bounds exceptionAnthony Hugh2015-10-282-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like the cached index had become invalid at some point. It's unclear why, but the logs suggest that a bunch of Home services crashed. Rather than cache the index within the Activity, I have changed the code to send the index along with the dialog activity launch. This way when the dialog returns, the index will be saved within the callback. The index should be enough because the permission set should not change for the app between screens and the permission set is alphabetized. BUG: 25334674 Change-Id: I8f9189960aa7fc9b09cc25f594397523550ac626
| * | | | | Make GrantPermissions dialog not swipable on WatchAnthony Hugh2015-10-281-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c70bf71517 * commit 'c70bf71517707e7b6d678f5d0a0c08d2ad91a68c': Make GrantPermissions dialog not swipable on Watch
| | * | | | Make GrantPermissions dialog not swipable on WatchAnthony Hugh2015-10-271-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | BUG: 24672088 Change-Id: I872b41684c741868dfb9eeed68d40cb983dcf139
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d21bd7cc4 -s ours * commit '6d21bd7cc40dc813d428be6555ddf43e39a44f42': Import translations. DO NOT MERGE
| | * | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 851c6ea6ee * commit '851c6ea6ee8c32d4c09c6b4f18b095e5da0541e5': Fix Permissions Dialog animations
| | * | | 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-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 53fff03d60 -s ours * commit '53fff03d60cf1f96d2135e84e18ebe73ac1a049e': Import translations. DO NOT MERGE
| | * | | 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