summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE Fixing Install button not enabled on resumeSuprabh Shukla2017-12-231-1/+1
| | | | | | | | | | | | | | | In cases where an app had a long list of permissions the Install button was not being enabled. Test: Manually clicked on an apk that required a long list of permissions. Checked that the install button is enabled. Switch out and back to the activity to force a pause/resume. The button gets disabled and enabled as expected. Also the existing test passes as before: gts-tradefed run gts-dev -m PackageInstallerTapjacking Bug: 35056974 Change-Id: I2ef7d5ce4e137969c70d2929271620c2bcb723f2 (cherry picked from commit 4c6afe94942c33e293d456be70ffa933d7d3e374)
* Revert "Revert "DO NOT MERGE Disable overlays while installer is resumed""Andreas Blaesius2017-12-231-2/+23
| | | | | | This reverts commit 54b91b04a2dd9da928230eeb9d62a43fc40eefe4. Change-Id: I0f207b7de5675595a07416aef169985bc322372f
* Revert "DO NOT MERGE Disable overlays while installer is resumed"replicant-6.0-0003mse19692017-10-221-23/+2
| | | | | | | | | | | | | | | | | | If mOkCanInstall is false when onResume() is called, the button gets disabled and never re-enabled. This fix is for branches that have change I42c15d05dffc1f6db69c9f67148f7ceb6e8bd8ae ("Split layout for confirm step.") which causes the button to be disabled and enabled for different reasons. Here the button is constantly enabled and its action changes depending on the value of mOkCanInstall. The attribute filterTouchesWhenObscured should prevent tapjacking when overlays are present, so revert this commit. This has also been done in branch cm-14.1 via commit 4b0c302eae8d772d09346718559cc42548485f75 This reverts commit 7a204a0e265a0a92537d57fd1bab594250c96149. Change-Id: I82b2c9ae0d588ef1696c8356a31c4204247823ad
* Back-port ag/2514922Phil Weaver2017-10-051-0/+9
| | | | | | | | | Bug: 62196835 Test: Verify overlays disappear on a11y capabilities dialog. Change-Id: I9a58fd647e53cb41f577d8d4782221d73b49f668 (cherry picked from commit 787c5b4948e309c0dbbf0f762c06fa07f88526b1)
* DO NOT MERGE Disable overlays while installer is resumedSuprabh Shukla2017-10-051-2/+23
| | | | | | | | | | | The install button can be disabled for other reasons, hence we have to store the enabled state independent of the resumed/paused state. Test: gts-tradefed run gts-dev -m PackageInstallerTapjacking Bug: 35056974 Change-Id: I2effa0f5afacfaed217a030550a778e32912cfbb (cherry picked from commit 287d1d11a321040948d6c12e48fa303eed3c4859)
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-022-57/+2
|\ | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic775ddf31a2f5c391898e83bed469041849f8903
| * [DO NOT MERGE] Bring back overlay warning in permissions UI.Svetoslav Ganov2016-05-252-57/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The package installer has a special event handling when the user tries to interact with it and an overlay window intersects the installer one. We show a warning that an overlay was detected and point the user to settings. This regressed and nothing happened when the users click the allow button. bug:28572707 bug:26677796 Change-Id: I617595e7cd5277576ccb9915946b77082a1c2b9e Resolution to mnc-mr2-release when CP'ing ag/1065580
* | Themes: Add tint mode so custom icons can show in permissions settingsBryan Owens2016-06-141-0/+2
| | | | | | | | | | Change-Id: I8fa2360d1340cb825938f4c820d99c98d3037baa Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
* | Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-071-0/+56
|\| | | | | | | | | | | Android 6.0.1 release 46 Change-Id: Ie2b11a3416c1719374f06c8048b29f27ab8414a7
| * DO NOT MERGE Take advantage of new MotionEvent flag to prevent tapjacking.Michael Wright2016-04-211-0/+56
| | | | | | | | | | | | | | Bug: 26677796 Change-Id: I563541f0a42564b854af0f8037c1d4741c79a2ac Fix merge conflict when cp'ing ag/903239 to mnc-mr1-release
* | Always have an icon am: 58045ad49aTodd Kennedy2015-12-171-2/+3
|\ \ | | | | | | | | | | | | | | | | | | am: 22d381113c * commit '22d381113c34edf57b7dc231a4b7fbce16a404b6': Always have an icon
| * \ Always have an iconTodd Kennedy2015-12-171-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 58045ad49a * commit '58045ad49af12b202b08a4f054a54e2774ca48f1': Always have an icon
| | * | Always have an iconTodd Kennedy2015-12-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The permission icon can be an external icon and thus might not exist. So, ensure we always have an icon for the permissions UI. Bug: 25602523 Change-Id: Ibdb1f296ff8c5f3664fe8056c8637844b580cce9
* | | | Merge "[PkgInstaller] Refactoring arguments of WearPackageInstaller" into ↵Vinod Krishnan2015-12-162-65/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-e-dev am: 79d4387181 * commit '79d43871818bc9b66d774d521e9c4d02c42eaef4': [PkgInstaller] Refactoring arguments of WearPackageInstaller
| * | | [PkgInstaller] Refactoring arguments of WearPackageInstallerVinod Krishnan2015-12-112-65/+118
| | | | | | | | | | | | | | | | | | | | | | | | - Creating a WearPackageArgs object Change-Id: I9616fe5e6621856e5d07da5cee205e7162dad451
* | | | Fix wake lock leakAnthony Hugh2015-12-041-27/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: cfc6b97c7d * commit 'cfc6b97c7d4dbaf7a50433a0f459ee4e25725e82': Fix wake lock leak
| * | | Fix wake lock leakAnthony Hugh2015-12-041-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wake lock was not being released when installation failed due to early bail out call. I wrapped the calls into a try/finally to ensure it gets released. Code was tested by tweaking the code to force a failure and test installing/uninstalling apps. BUG: 25814793 Change-Id: I2e81e5d76edcfb601ce734cf571705e979c51f32
| * | | 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
|\| | | | | | | | | | | Change-Id: I965fb579e2730fa1cdb182bc18e134f262929328
| * | Clean up package installer stylingSvetoslav2015-11-2022-46/+1777
| |\ \ | | |/ | |/| | | | | | | | | | | | | am: 2cf17ddcef * commit '2cf17ddcef3c8dd260bd3d174123842c81a7d025': Clean up package installer styling
| | * Clean up package installer stylingSvetoslav2015-11-1822-46/+1777
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2022-44/+2044
| | | | | | | | | | | | Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
* | | 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
| | | | | | | | | | | | Change-Id: I9c5a0be4e18cc27e163da60ba9dd81ae71588bef
* | | 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
|\ \ \
| * | | 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-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
* | | 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
* | | Reduce the top padding when message isn't at top.Danny Epstein2015-10-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | 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-052-50/+99
| | | | | | | | | | | | | | | | | | | | | | | | 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-012-2/+27
|\ \
| * | Block Install Intent for Wear devicesVinod Krishnan2015-09-282-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "Add enabled/disabled icons for permissions on Wear" into cw-e-devAnthony Hugh2015-09-251-2/+48
|\ \ \
| * | | Add enabled/disabled icons for permissions on WearAnthony Hugh2015-09-231-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fix CTS test by renaming button ids to matchAnthony Hugh2015-09-241-4/+4
|/ / / | | | | | | | | | | | | BUG: 24264373 Change-Id: I9f04ff68dcd11f48df9331abf2f1775c95f31f99
* | | Merge "Add new dialog for warning confirmations" into cw-e-devAnthony Hugh2015-09-233-24/+151
|\ \ \ | |/ / |/| |
| * | Add new dialog for warning confirmationsAnthony Hugh2015-09-233-24/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | MNC Perms: Button bar animate to max half window heightVinod Krishnan2015-09-221-3/+9
|/ / | | | | | | | | | | | | | | | | | | - Make sure that the button bar only animates to half way (max). - Also make the buttons scrollable Bug: 24265941 Bug: 24208967 Change-Id: I68d01c72658c0e7aff35b899b638da123c44d62e