summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge "Fix crash in OnDismiss" am: bae2b676e4Svetoslav Ganov2015-11-101-4/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | | | | | | | | | | | | am: 9e712cb5c5 * commit '9e712cb5c511c21e2b962c7b67c099254e5ff843': Fix crash in OnDismiss
| | * | | | Merge "Fix crash in OnDismiss"Svetoslav Ganov2015-11-101-4/+8
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: bae2b676e4 * commit 'bae2b676e47548f9b8f0cf7ca1aae22ff806bfbb': Fix crash in OnDismiss
| | | * | | Merge "Fix crash in OnDismiss"Svetoslav Ganov2015-11-101-4/+8
| | | |\ \ \
| | | | * | | Fix crash in OnDismissCiesla, Jakub 2 (EXT)2015-10-071-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Steps to reproduce the crash are as follows: 1. Launch Settings >> Apps 2. Select an app to uninstall 3. Select “uninstall” then confirmation comes up 4. Tap Home key and launch Settings apps again 5. You see app crash notification This was due to DialogFragment.onDismiss() called after the underlying activity was stopped and detached. In other cases (cancel, delete, back key) there is no problem. For home key scenario it is enough to check, if dialog is currently added to its activity. Fragment.isAdded() checks internally, if its activity is not null and if it's added to this activity. BUG: https://code.google.com/p/android/issues/detail?id=144163 Change-Id: I3cb75ec392fd68f131ec65e4eafae2351e95ea25
* | | | | | | resolve merge conflicts of e8c6801367 to cw-e-dev. am: 012a557f59 am: 6f8e0b2bdcVinod Krishnan2015-11-071-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 38b87543b0 * commit '38b87543b0fb252ecddb7ea87688ac2aaeb15319': 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
* | | | | | | Merge "Clean up USER_OWNER in PackageInstaller"Xiaohui Chen2015-11-041-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Clean up USER_OWNER in PackageInstallerXiaohui Chen2015-11-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25086442 Change-Id: Ia7d81a93f1888d7b9602a94aebfc89433e89d040
* | | | | | | | Button bar animating when it isn\'t supposed to am: 914243ab7d am: 09ae425c5eAnthony Hugh2015-11-031-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4404cc7839 * commit '4404cc7839760c0d6baa5a7f37c7de347e0e6f87': 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-dev ↵Anthony Hugh2015-10-302-3/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ae6139679d am: 5b3d79ac1f am: 4ba106a392 * commit '4ba106a392dccff3364249eef4596ecea9e71263': 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 exception am: e18bfc2201 am: a7bd3497cbAnthony Hugh2015-10-302-11/+21
|\| | | | | | | | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cfddca511c * commit 'cfddca511c64fbb2cf3b007225dd39fac64c08b2': 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
* | | | | | Merge "Remove InstallFlowAnalytics"Todd Kennedy2015-10-235-712/+1
|\ \ \ \ \ \
| * | | | | | Remove InstallFlowAnalyticsTodd Kennedy2015-10-235-712/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were no longer being used and they were broken with a recent change adjusting the flow of the PackageInstaller. Bug: 24542039 Change-Id: I14b98dd0f8cdb69d31eab54a3f1b96048263c222
* | | | | | | Fix Permissions Dialog animations am: 851c6ea6ee am: f47279b1b8Anthony Hugh2015-10-211-4/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | am: 896a16d1d3 * commit '896a16d1d34df5ad434dd1746c2eefdb23f14dc2': 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
* | | | | | Reduce the top padding when message isn\'t at top. am: 51f646b19d am: c55cd1b71dDanny Epstein2015-10-201-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 926dd3bc9a * commit '926dd3bc9a733ef69ca775c49d29384420ac4175': Reduce the top padding when message isn't at top.
| * | | | | 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. am: dc40bd77b1 am: e7cdf95de2Danny Epstein2015-10-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9934b9bf1c * commit '9934b9bf1ccff95c709b1c123373ee283de54cc8': Add top padding to grant permission content.
| * | | | | 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 6ab20b0a: am 70dc8572: am 16bd317a: am 6986f29b: Auto grant permissions ↵Svetoslav Ganov2015-10-161-2/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in an already granted group. * commit '6ab20b0a5009f9e30e9d95ffd36fd6bf03befe93': 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.
| | * | | | Auto grant permissions in an already granted group.Svetoslav Ganov2015-10-151-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:24074183 Change-Id: Iad6f9b7d5b83d0b0121796891bcd069658995a47
* | | | | | am 02f2bd58: am 55269150: am 7307dc71: am 86f1ee8c: Revert "Auto grant ↵Ian Pedowitz2015-10-151-18/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions in an already granted group." * commit '02f2bd58b7db479fd3f52cbe4ba9d20ae36c5aa0': 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."
| | * | | | 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)
* | | | | am d54394bc: am 4b075964: am adf405b0: Merge "MNC Perms: Missed some cases ↵Vinod Krishnan2015-10-131-48/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for package installation" into cw-e-dev * commit 'd54394bc0c67c7d4dbfb2d4706fa580ab69b695c': 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 32166799: am 42d2621f: am 0e3c7dbd: Modifies wear Permission title height ↵Alex Hills2015-10-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid clipping * commit '321667991ce6d1511441aaa4d309e08472fdf8bd': Modifies wear Permission title height to avoid clipping
| * | | | 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
* | | | am 4c1c4097: am 71b7629e: am 6a576288: Permissions redline fixesAnthony Hugh2015-10-052-50/+99
|\| | | | | | | | | | | | | | | | | | | * commit '4c1c40976eacb18a2e164ca7a8f773237aab986c': Permissions redline fixes
| * | | 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
* | | | am 5fe06be5: am 50728943: am 12c698b4: Merge "Block Install Intent for Wear ↵Vinod Krishnan2015-10-012-2/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | devices" into cw-e-dev * commit '5fe06be584a0f5039a973f3370cf0875bb6ec002': Block Install Intent for Wear devices
| * | | 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
* | | | | Use PackageInstaller.SessionTodd Kennedy2015-09-302-49/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've been using the deprecated package manager installation methods. Replace those with the PackageInstaller.Session installation mechanism. Bug: 22282121 Change-Id: I34aefcbae2703c400a7ed35780f61713992b7181
* | | | | am 4d307cad: am e8ad29b3: am f482f773: Merge "Add enabled/disabled icons for ↵Anthony Hugh2015-09-271-2/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions on Wear" into cw-e-dev * commit '4d307cad108600c11a8a3bf5bfa95fce20cb474e': Add enabled/disabled icons for permissions on Wear
| * | | | 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
* | | | | | am 93431368: am b13684d6: am 0d0e466a: Fix CTS test by renaming button ids ↵Anthony Hugh2015-09-241-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to match * commit '934313681d704d8027af808daeeabff421e6988c': Fix CTS test by renaming button ids to match
| * | | | | Fix CTS test by renaming button ids to matchAnthony Hugh2015-09-241-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | BUG: 24264373 Change-Id: I9f04ff68dcd11f48df9331abf2f1775c95f31f99
* | | | | am 6fcb1785: am c81004d9: am 9d51c1e1: Merge "Add new dialog for warning ↵Anthony Hugh2015-09-233-24/+151
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations" into cw-e-dev * commit '6fcb1785f63bceecbedd06bcafc03c77bc8b9aa4': Add new dialog for warning confirmations
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 09:44:10 +0000