PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,152 Commits 1 Branch 0 Tags
80f2b5430e3a448d9c818e33ceff9cd674ecbbda
Commit Graph

23152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xiyuan Xia
060ce6b5a7 am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit '9e06cbf5a379d0a05f13d2a6e1660793fb7015a3':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 19:07:30 +00:00
Jason Monk
65b0666d36 Merge "Protect against multiple provision responses" into mnc-dr-dev 2015-09-01 19:02:44 +00:00
Xiyuan Xia
9e06cbf5a3 am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit 'a104c05da9d42375f7307cce58039f7edafaa078':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 18:54:08 +00:00
Xiyuan Xia
a104c05da9 Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 2015-09-01 18:46:19 +00:00
Xiyuan Xia
e47a2ab83e Fix wrong stage exception in ChooseLockPattern 
ChooseLockPattern should updateStage instead of always enabling
pattern view input.

Bug:22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
 2015-09-01 11:29:36 -07:00
Jason Monk
359170f4b0 Protect against multiple provision responses 
Bug: 23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
 2015-09-01 13:20:55 -04:00
Xiyuan Xia
00b17fa3c3 Fix races in ConfirmPassword/Pattern 
- 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
 2015-08-31 15:25:31 -07:00
Geoff Mendal
938cf6f863 am 9cc1143d: (-s ours) am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE 
* commit '9cc1143d8f7e7810b73516f0797558c09614c477':
  Import translations. DO NOT MERGE
 2015-08-31 14:35:52 +00:00
Geoff Mendal
9cc1143d8f am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE 
* commit '0e6d38462b96c61465d06ce6c5dfa17297e49df8':
  Import translations. DO NOT MERGE
 2015-08-31 14:25:26 +00:00
Geoff Mendal
0e6d38462b am f33098ea: (-s ours) Import translations. DO NOT MERGE 
* commit 'f33098eaa02416997775fe1112484c56b13dc93b':
  Import translations. DO NOT MERGE
 2015-08-31 14:18:22 +00:00
Geoff Mendal
f33098eaa0 Import translations. DO NOT MERGE 
Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426
Auto-generated-cl: translation import
 2015-08-31 07:07:58 -07:00
Geoff Mendal
7baf9a3e8a am f7a20d53: (-s ours) am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE 
* commit 'f7a20d5349288f5efb7c94c60d7459b335fb9f98':
  Import translations. DO NOT MERGE
 2015-08-29 23:09:59 +00:00
Geoff Mendal
f7a20d5349 am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE 
* commit 'e387dccbacb9119fec02a54d26440ef5a2ee0ce1':
  Import translations. DO NOT MERGE
 2015-08-29 22:57:36 +00:00
Geoff Mendal
e387dccbac am 96edf807: (-s ours) Import translations. DO NOT MERGE 
* commit '96edf8077347297d030af02a9452c726bbc421c8':
  Import translations. DO NOT MERGE
 2015-08-29 22:44:43 +00:00
Geoff Mendal
96edf80773 Import translations. DO NOT MERGE 
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
 2015-08-29 08:38:50 -07:00
Maurice Lam
2fef059543 am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 
* commit '07c2561d80fba5b3764177aa03dc4496cbe9b47e':
  [Fingerprint] Add skip dialog during SUW
 2015-08-28 22:41:42 +00:00
Maurice Lam
07c2561d80 am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 
* commit '8cea65f99f23c1a86d7a760b2dba89fa83036959':
  [Fingerprint] Add skip dialog during SUW
 2015-08-28 22:31:35 +00:00
Maurice Lam
8cea65f99f am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
  [Fingerprint] Add skip dialog during SUW
 2015-08-28 22:24:52 +00:00
Maurice Lam
3087a4e0fd Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 2015-08-28 22:13:19 +00:00
Maurice Lam
48cf33a94e [Fingerprint] Add skip dialog during SUW 
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.

Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
 2015-08-28 12:39:21 -07:00
Geoff Mendal
515d5f32d5 am c350e4e1: (-s ours) am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE 
* commit 'c350e4e1335c0d9f89fb7be81b65baaf36a30f0f':
  Import translations. DO NOT MERGE
 2015-08-28 10:34:06 +00:00
Geoff Mendal
90972fe510 am e6d06aeb: (-s ours) am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE 
* commit 'e6d06aeb2c5d2a70f71aa1a5365eb2dea46692d8':
  Import translations. DO NOT MERGE
 2015-08-28 10:25:49 +00:00
Geoff Mendal
c350e4e133 am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE 
* commit '15f11ef2470d231d495dec7df6410952f07073c2':
  Import translations. DO NOT MERGE
 2015-08-28 10:25:32 +00:00
Geoff Mendal
15f11ef247 am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE 
* commit 'fea2b30ac49e5075a4cc78c1e694a62334192f0a':
  Import translations. DO NOT MERGE
 2015-08-28 10:21:01 +00:00
Geoff Mendal
e6d06aeb2c am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE 
* commit '2751a8cf319c58f83564ff9eb5efbf5b32d2dc7f':
  Import translations. DO NOT MERGE
 2015-08-28 10:20:47 +00:00
Geoff Mendal
fea2b30ac4 am 37dfaa13: (-s ours) Import translations. DO NOT MERGE 
* commit '37dfaa13ec6882720ca100ef235a7649046aec12':
  Import translations. DO NOT MERGE
 2015-08-28 10:14:49 +00:00
Geoff Mendal
2751a8cf31 am db044ffb: (-s ours) Import translations. DO NOT MERGE 
* commit 'db044ffbc6b90ba2730bfd7a97e0593e50d9b014':
  Import translations. DO NOT MERGE
 2015-08-28 10:13:21 +00:00
Geoff Mendal
db044ffbc6 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 23544168
Change-Id: Iade81d81334be9289e7381f05931257154f72a6f
 2015-08-28 03:06:04 -07:00
Geoff Mendal
37dfaa13ec Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 23544168
Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
 2015-08-28 03:02:07 -07:00
Xiyuan Xia
12ec7efeb3 am e053491b: am e927bd70: am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 
* commit 'e053491bcc55ce844cd1f38dc61dac7edc15750a':
  Fix ChoosePat/Pin/Pwd crash from async task
 2015-08-28 02:04:41 +00:00
Xiyuan Xia
e053491bcc am e927bd70: am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 
* commit 'e927bd7014c34e6f368da9325fc78b2df5362a99':
  Fix ChoosePat/Pin/Pwd crash from async task
 2015-08-28 01:59:06 +00:00
Xiyuan Xia
e927bd7014 am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 
* commit '43fe6dba693f8f23ffd69c1ffcd3b5642266be58':
  Fix ChoosePat/Pin/Pwd crash from async task
 2015-08-28 01:52:26 +00:00
Xiyuan Xia
43fe6dba69 Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 2015-08-28 01:46:57 +00:00
Xiyuan Xia
3e7e3d6c59 Fix ChoosePat/Pin/Pwd crash from async task 
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.

Bug:23424884
Bug:23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
 2015-08-27 13:35:55 -07:00
Sanket Padawe
a3618fca90 am 62037449: (-s ours) am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev 
* commit '620374492fc90c010adc0ce348fa650718e56d8a':
 2015-08-27 11:36:22 +00:00
Christopher Tate
bbacf99a63 am 356e5b58: (-s ours) am ffe701dc: Present the security patch date in a human-friendly format 
* commit '356e5b585ca83b100429b13e07f9c3f2a1b9f50b':
 2015-08-27 11:36:21 +00:00
Selim Cinek
0376623ae4 am c877856a: (-s ours) am 19551115: Adapted string length translation limits 
* commit 'c877856a055d16a79f610903eb84cfb958c18547':
 2015-08-27 11:36:19 +00:00
Julia Reynolds
09e311b9a9 am 42f2b354: (-s ours) am 0ece6a32: String update for battery details page. 
* commit '42f2b35435725eda30f27d022128c7e36627c2ae':
 2015-08-27 11:36:18 +00:00
Adam Lesinski
3f76d948e6 am f71fbbff: (-s ours) am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit 'f71fbbffb5f2c179bd11b4415373209314f5adb7':
 2015-08-27 11:36:17 +00:00
Jeff Sharkey
875b1fec7a am 08fe57cb: (-s ours) am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit '08fe57cbbbd1fba6a9bf883724c4d204da83ff29':
 2015-08-27 11:36:16 +00:00
Chris Tate
e5aeeffcdb am 71efd816: (-s ours) am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '71efd816e635fb348d07882d303c8432da2504b9':
 2015-08-27 11:36:15 +00:00
Jeff Sharkey
6d1ec23f45 am 38c81907: (-s ours) am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev 
* commit '38c819072c54c37c7d4aa9038f4f6b13a38053f9':
 2015-08-27 11:36:13 +00:00
Geoff Mendal
f1f6a0b920 am 36fe2c6a: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE 
* commit '36fe2c6a13862b80f5173e4b4791e9e5e7f41931':
 2015-08-27 11:36:12 +00:00
Dianne Hackborn
1b33e6b5d0 am df85a4fc: (-s ours) am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'df85a4fc2194fb95a67e8388479f1b07dba7fa3c':
 2015-08-27 11:36:10 +00:00
Andres Morales
68bf950817 am af48dffe: (-s ours) am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev 
* commit 'af48dffe4f8f350370f8122695d8b53b2d5894f9':
 2015-08-27 11:36:09 +00:00
Dianne Hackborn
9344eb4534 am 7f45b55d: (-s ours) am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit '7f45b55dd8039ad1a62d88f36b8c6d2733dbb13b':
 2015-08-27 11:36:07 +00:00
Maurice Lam
9ee252e863 am ef906938: (-s ours) am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 
* commit 'ef906938955dcd95ed76e750d7e7b812d8ab926a':
 2015-08-27 11:36:05 +00:00
Dianne Hackborn
838c4a2e70 am ef54ab61: (-s ours) am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog 
* commit 'ef54ab616a8bd0e68fca50529054da895584bd9f':
 2015-08-27 11:36:04 +00:00
Dianne Hackborn
9c0a7f91a9 am f6649472: (-s ours) am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'f664947291c1e951efddbffa2d073806e691003b':
 2015-08-27 11:36:02 +00:00
Dianne Hackborn
e81e1816c8 am 6aeabbf2: (-s ours) am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '6aeabbf2d2166e06ab742bdfaf94f0a9f383f891':
 2015-08-27 11:36:00 +00:00