summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-devMaurice Lam2015-07-211-1/+3
|\
| * [ScreenLock] Change title for RedactionInterstitialMaurice Lam2015-07-201-1/+3
| | | | | | | | | | | | | | Change the title for RedactionInterstital to "Notifications". Bug: 22587892 Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
* | Don't launch ConfirmDeviceCredentials multiple times.Jim Miller2015-07-201-6/+9
| | | | | | | | | | | | Fixes bug 18724944 Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
* | Merge "Handle monkey crash" into mnc-devJason Monk2015-07-201-1/+3
|\ \
| * | Handle monkey crashJason Monk2015-07-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Don't create dialog if we don't have one to create, and make sure that storage-related prefs are removed when they aren't needed. Bug: 22571238 Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
* | | Merge "Offer 'ask' as an available app-linking state" into mnc-devChristopher Tate2015-07-201-36/+60
|\ \ \ | |/ / |/| |
| * | Offer 'ask' as an available app-linking stateChristopher Tate2015-07-171-36/+60
| |/ | | | | | | | | | | Bug 22532193 Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
* | Merge "Simplify FingerprintSettings" into mnc-devJim Miller2015-07-171-30/+46
|\ \
| * | Simplify FingerprintSettingsJim Miller2015-07-171-30/+46
| |/ | | | | | | | | | | | | | | | | | | There's no need for FingerprintSettings to retry fingerprint any more often than these cases: 1. authentication success, 2. authentication error and 3. when the activity resumes. Fixes bug 22438498 Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0
* | Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app ↵Billy Lau2015-07-173-40/+28
|\ \ | |/ |/| | | change)..." into mnc-dev
| * Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...Billy Lau2015-07-173-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overall, fixed the detection of the state of permission in the corresponding UX to be more accurate. Also ensured that apps can actually launch the summary UX through a custom intent. AndroidManifest: Adds the proper intent-filter so that apps can launch the Settings page using intent. strings: Made changes to strings so that wordings are uniform everywhere and raised the char limit due to requests from translators. Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
* | Intent filters need CATEGORY_BROWSABLE to be app-linking eligibleChristopher Tate2015-07-161-2/+3
|/ | | | | | Bug 22504009 Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
* Merge "Show disabled trust agents as off." into mnc-devKenny Guy2015-07-161-0/+1
|\
| * Show disabled trust agents as off.Kenny Guy2015-07-151-0/+1
| | | | | | | | | | | | | | | | When trust agents are disabled by the admin show the greyed out toggle as off. Bug: 22397930 Change-Id: I687a5dee0ca9bed5015a4af080270f7bafa5a37d
* | Merge "Use common xml file for multi-tab settings." into mnc-devSanket Padawe2015-07-161-1/+1
|\ \
| * | Use common xml file for multi-tab settings.Sanket Padawe2015-07-141-1/+1
| | | | | | | | | | | | | | | Bug: 22360525 Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
* | | Merge "Disable ignore battery optimization items that can't change" into mnc-devJason Monk2015-07-151-0/+11
|\ \ \
| * | | Disable ignore battery optimization items that can't changeJason Monk2015-07-151-0/+11
| | | | | | | | | | | | | | | | | | | | Bug: 22507803 Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
* | | | Merge "Change move storage from dropdown pref to dialog" into mnc-devJason Monk2015-07-151-21/+40
|\ \ \ \
| * | | | Change move storage from dropdown pref to dialogJason Monk2015-07-151-21/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use a horizontal pref and a single button that triggers the dialog Bug: 21922660 Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
* | | | Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-devMaurice Lam2015-07-1511-23/+407
|\ \ \ \
| * | | | [Fingerprint] Add fingerprint enroll in setup wizardMaurice Lam2015-07-1511-23/+407
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a subclass for each enrolling screen that setup wizard uses, and in override the corresponding get*Intent methods to always use the setup wizard versions of the next screens. On minor change made to the original flow is that it will now return RESULT_OK if it is finished, as opposed to RESULT_CANCELED. Bug: 21695577 Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
* | | | | Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-devMaurice Lam2015-07-152-6/+6
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | [Fingerprint] Export FingerprintEnrollIntroductionMaurice Lam2015-07-152-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Export FingerprintEnrollIntroduction activity under the permission MANAGE_FINGERPRINT so that setup wizard can start it. Bug: 21695577 Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702 (cherry picked from commit 052297172e33ec906a5da10a953be811ff60731c)
* | | Merge "Fix Help menu for PrivateVolumeSettings" into mnc-devJason Monk2015-07-151-0/+1
|\ \ \ | |/ / |/| |
| * | Fix Help menu for PrivateVolumeSettingsJason Monk2015-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Call super.onCreateOptionsMenu so that the auto help stuff can work properly. Bug: 22202745 Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
* | | Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-devxinhe2015-07-141-4/+15
|\ \ \
| * | | Need to disable 5GHz bands for WiFi tethering in Japanxinhe2015-07-141-4/+15
| | |/ | |/| | | | | | | | | | | | | b/22396383 Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
* | | Merge "Postpone call to postEnroll() until we actually leave activity." into ↵Jim Miller2015-07-141-2/+11
|\ \ \ | | | | | | | | | | | | mnc-dev
| * | | Postpone call to postEnroll() until we actually leave activity.Jim Miller2015-07-131-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing code was calling postEnroll() too soon, which resulted in the inability to add more than one fingerprint. The solution is to only call postEnroll() when we're leaving the activity. Fixes bug 22438498 Change-Id: Ia134899e12b4edc9cced834e99cb2bfd2d51321f
* | | | Merge "Add content description to wifi networks" into mnc-devJason Monk2015-07-141-0/+19
|\ \ \ \
| * | | | Add content description to wifi networksJason Monk2015-07-141-0/+19
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 22468835 Change-Id: Ifd9d0384030befbd221b14599159348bf56d41c8
* | | | Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS ↵Billy Lau2015-07-1410-223/+1045
|\ \ \ \ | | | | | | | | | | | | | | | permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
| * | | | Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to anBilly Lau2015-07-1310-223/+1045
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicit toggle to be enabled through Settings via Apps -> Advanced Apps. Added new and refactored an old xml to define the UX for two new Preferences in Advanced Settings. Modified the existing AdvancedAppSettings to add control flow for two new settings. Also enriched ManageApplications to handle these cases. Added additional strings in xml/values/strings.xml to support these settings. Also defined new classes to handle these the toggle of these permissions per app. Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so that future usages related to AppOps can inherit from this class. Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
* | | | | Merge "Disable voice input if assist is voice service" into mnc-devJorim Jaggi2015-07-142-2/+24
|\ \ \ \ \
| * | | | | Disable voice input if assist is voice serviceJorim Jaggi2015-07-142-2/+24
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug: 22358252 Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
* | | | | Merge "Disable notification volume when user restricted" into mnc-devJason Monk2015-07-141-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Disable notification volume when user restrictedJason Monk2015-07-131-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 22327825 Change-Id: I892627e00d9ebe2cd67348ce6da3c9c7bc0251fc
* | | | Merge "Fix up Tap and Pay how it works." into mnc-devMartijn Coenen2015-07-141-2/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix up Tap and Pay how it works.Martijn Coenen2015-07-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, don't use HCE service description. Bug: 21988684 Bug: 21657963 Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
* | | | Use same technology type for LTE/4GSanket Padawe2015-07-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Though status bar and preferred network type show 4G, still show LTE in SIM status when device set config_show4GForLTE true Bug: 22213113 Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
* | | | Merge "import new view enums into MetricsLogger" into mnc-devChris Wren2015-07-133-5/+3
|\ \ \ \
| * | | | import new view enums into MetricsLoggerChris Wren2015-07-103-5/+3
| | |/ / | |/| | | | | | | | | | | | | | Bug: 21114836 Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a
* | | | Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" ↵Zoltan Szatmary-Ban2015-07-131-2/+1
|\ \ \ \ | |/ / / |/| | | | | | | into mnc-dev
| * | | Do not throw exception when MeasurementDetails.mediaSize is emptyZoltan Szatmary-Ban2015-07-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys added to the returned MeasurementDetails, when the following is true: mVolume == null || !mVolume.isMountedReadable() Bug: 22394495 Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
* | | | Merge "Match getLegacyVpn calls to changed interface" into mnc-devRobin Lee2015-07-102-2/+2
|\ \ \ \
| * | | | Match getLegacyVpn calls to changed interfaceRobin Lee2015-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The userId argument is now explicit. Pre-requisite for bug 21499103 Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
* | | | | Merge "Remove unused MediaFormat activity" into mnc-devRubin Xu2015-07-101-171/+0
|\ \ \ \ \
| * | | | | Remove unused MediaFormat activityRubin Xu2015-07-091-171/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of cleanup of ExternalStorageFormatter. Bug: 9433509 Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
* | | | | | Merge "Fix wifi not re-ordering" into mnc-devJason Monk2015-07-101-1/+5
|\ \ \ \ \ \
generated by cgit v1.1 at 2025-08-05 23:21:22 +0000