summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add color transform settingJason Monk2015-09-187-2/+255
| | | | | Bug: 24038268 Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
* Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-devPaul Lawrence2015-09-182-0/+2
|\
| * Stop long passwords crashing CryptKeeperPaul Lawrence2015-09-162-0/+2
| | | | | | | | | | Bug: 24017705 Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
* | Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-devPaul Lawrence2015-09-181-2/+1
|\ \
| * | Remove don't kill flag from CryptKeeper to stop logspamPaul Lawrence2015-09-141-2/+1
| |/ | | | | | | | | Bug: 23500739 Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
* | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-1562-622/+312
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2015-09-1462-622/+312
| | | | | | | | | | | | | | | Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a Auto-generated-cl: translation import
* | | Fix IndexOutOfBoundsException while silent provisioning checkHyejin2015-09-142-22/+38
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | - If hostpot off, we receive result through HotspotOffReceiver. Sometimes, during provisioning, we're used to receive this. In this case, we don't care. After provisioning, we'll receive the intent again. - In stress test, index is sometimes invalid, equals to mCurrentTethers.size(). So, when provisioning, We check whether index is valid or not. BUG=23528220 Change-Id: I70f35e045042c6c81b1db03e2a44cd41d3e7437f
* | Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown ↵Selim Cinek2015-09-121-2/+13
|\ \ | | | | | | | | | twice." into mnc-dr-dev
| * | Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.Selim Cinek2015-09-111-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | When rotating the ConfirmDeviceCredentials Activity, it was launched again after solving the challenge. Bug: 23937676 Change-Id: Ic0852448f498c79d5448c72cbc31bb55d9bfeddb
* | | Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-devJorim Jaggi2015-09-111-0/+15
|\ \ \
| * | | Add timeout if we dont get onEnterAnimationCompleteJorim Jaggi2015-09-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Window manager doesn't send us onEnterAnimationComplete in the case where there are two activites starting at the same time and the screen orientation is changing. Add a timeout to work around this until we have a proper fix. Bug: 23849216 Change-Id: I4be7787d1bc13f8cb0ffd892010c4b5c0142c783
* | | | Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" ↵Jorim Jaggi2015-09-113-20/+18
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | into mnc-dr-dev
| * | Finish trampoline activity for ConfirmDeviceCredential immediatelyJorim Jaggi2015-09-103-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to finish ConfirmDeviceCredentialActivity directly, and use Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a state where we have the trampoline activity but not the real activity. Bug: 23849216 Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb
* | | am 1538dde4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-110-0/+0
|\ \ \ | | | | | | | | | | | | | | | | * commit '1538dde4fbb00617bfd1d51f958f32ba4d68ff12': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEBaligh Uddin2015-09-1018-393/+393
| | | | | | | | | | | | | | | | | | | | Change-Id: I4e9b6d6564301a352d9034269dbd989b728555f5 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-1178-309/+1089
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-1078-309/+1089
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19 Auto-generated-cl: translation import
* | | | | Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" ↵Jorim Jaggi2015-09-111-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | into mnc-dr-dev
| * | | | Fix crash in when restoring CredentialCheckResultTracker FragmentJorim Jaggi2015-09-101-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 23956504 Change-Id: I884e47a793d6bc00cc0c54fe9e3d4bcf4e0199c1
* | | | Include the usb data mode regardless of data roleJason Monk2015-09-101-2/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Turns out there are valid data modes in host mode (like midi). Need to allow these through for the dialog to set the proper current state. Bug: 23905770 Change-Id: I7a37ad95ccaf18f211d2b2d330c7f1d7af4cfc16
* | | Merge "Add double-tap power button to open camera 2/2" into mnc-dr-devJorim Jaggi2015-09-103-1/+44
|\ \ \
| * | | Add double-tap power button to open camera 2/2Jorim Jaggi2015-09-093-1/+44
| | | | | | | | | | | | | | | | | | | | Bug: 23787555 Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
* | | | Merge "Handle fp enrollment errors more gracefully - When finger can't be ↵Jim Miller2015-09-096-23/+104
|\ \ \ \ | |/ / / |/| | | | | | | analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again." into mnc-dr-dev
| * | | Handle fp enrollment errors more gracefullyJim Miller2015-09-096-23/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again. Fixes bug 23546104 Fixes bug 22708384 Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
* | | | Hide or show APNs with type="ims" as CarrierConfigSungmin Choi2015-09-081-1/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APN with type="ims" is used to attach IMS APN to the modem. This APN is meaningless and confusing to end users. Most carriers don't care to show this APN from apn list. Some carriers want to show this APN from apn list and others don't. This change hides or shows this as CarrierConfig from the APN list. Bug: 23770219 Change-Id: Ia632f39401d84e8c63ac96f1c3b12aa3d8d2a4e6
* | | Fix buildJorim Jaggi2015-09-081-1/+1
| | | | | | | | | | | | Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
* | | Fix crash in fingerprint settings when rotatingJorim Jaggi2015-09-081-7/+2
| | | | | | | | | | | | | | | | | | | | | Fragments always need empty constructors. Bug: 23806551 Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
* | | Import translations. DO NOT MERGEGeoff Mendal2015-09-0778-160/+82
| | | | | | | | | | | | | | | Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660 Auto-generated-cl: translation import
* | | Merge "Start tether service with redeliver intent" into mnc-dr-devJason Monk2015-09-031-1/+1
|\ \ \
| * | | Start tether service with redeliver intentJason Monk2015-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that the intent comes back when we are restarted rather than null causing a crash. Bug: 23678853 Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
* | | | Merge "Fix fingerprint settings ripples" into mnc-dr-devJorim Jaggi2015-09-031-1/+2
|\ \ \ \
| * | | | Fix fingerprint settings ripplesJorim Jaggi2015-09-021-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 22471044 Bug: 23234027 Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
* | | | Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-devMaurice Lam2015-09-022-5/+3
|\ \ \ \
| * | | | [Fingerprint] Update strings for skip dialogMaurice Lam2015-09-022-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23228889 Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
* | | | | To hide none security option, use config_hide_none_security_option configSungmin Choi2015-09-023-0/+27
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use mcc config overlay mechanism to hide none security option in countries where it is mandatory. To hide none security option, set config_hide_none_security_option config true as mcc config overlay. Bug: 22209425 Bug: 22975388 Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-09-0244-261/+147
| | | | | | | | | | | | | | | | | | | | Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce Auto-generated-cl: translation import
* | | | Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-devXiyuan Xia2015-09-013-66/+179
|\ \ \ \
| * | | | Fix races in ConfirmPassword/PatternXiyuan Xia2015-08-313-66/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a CheckLockResultTracker to track result of async lock check so that it can finish on configuration change; - Let the pending lock check finish and ignore subsequent check requests; - Add a mDisappearing flag to prevent running disappear animation multiple times; - Check whether activity is still active after disappear animation before setting result and finishing it; - Remove no longer used mNumWrongConfirmAttempts; Bug:23190499 Change-Id: If1784d3d1fcc152ac06137b12748b9def5726692
* | | | | Merge "Protect against multiple provision responses" into mnc-dr-devJason Monk2015-09-011-2/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Protect against multiple provision responsesJason Monk2015-09-011-2/+6
| | |/ / | |/| | | | | | | | | | | | | | Bug: 23573004 Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
* | | | Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-devXiyuan Xia2015-09-011-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix wrong stage exception in ChooseLockPatternXiyuan Xia2015-09-011-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | ChooseLockPattern should updateStage instead of always enabling pattern view input. Bug:22760251 Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
* | | Import translations. DO NOT MERGEGeoff Mendal2015-08-3142-294/+174
| | | | | | | | | | | | | | | Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-08-2978-8/+476
| | | | | | | | | | | | | | | Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a Auto-generated-cl: translation import
* | | Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-devMaurice Lam2015-08-282-2/+60
|\ \ \ | |/ / |/| |
| * | [Fingerprint] Add skip dialog during SUWMaurice Lam2015-08-282-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | During setup wizard, add a skip dialog to confirm whether the user wants to skip fingerprint setup or not. Bug: 23228889 Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
* | | am 37dfaa13: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-280-0/+0
|\ \ \ | | |/ | |/| | | | | | | * commit '37dfaa13ec6882720ca100ef235a7649046aec12': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEGeoff Mendal2015-08-2878-451/+301
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 23544168 Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
* | | Import translations. DO NOT MERGEGeoff Mendal2015-08-2817-80/+80
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 23544168 Change-Id: Iade81d81334be9289e7381f05931257154f72a6f
generated by cgit v1.1 at 2024-08-02 00:37:30 +0000