PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,865 Commits 1 Branch 0 Tags
a4b5e202d5a76f13d2c528fc9e589113a4955c20
Commit Graph

21865 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
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
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
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
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
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
Geoff Mendal
ebf23a763f am 3b545b41: (-s ours) am fbfdede1: (-s ours) Import translations. DO NOT MERGE 
* commit '3b545b41b931919fab3528e2bbb81ded620378b2':
  Import translations. DO NOT MERGE
 2015-08-26 14:25:58 +00:00
Geoff Mendal
3b545b41b9 am fbfdede1: (-s ours) Import translations. DO NOT MERGE 
* commit 'fbfdede15b6a81655a5b4fc274340ba58c3d4a99':
  Import translations. DO NOT MERGE
 2015-08-26 14:19:37 +00:00
Geoff Mendal
fbfdede15b Import translations. DO NOT MERGE 
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
 2015-08-26 07:12:08 -07:00
Jim Miller
d63408d915 am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev 
* commit 'd7e4cd9b1edb25651d3fa306e389b7ec858c1ed8':
  Don't attempt to remove fp templates if none are enrolled
 2015-08-25 23:25:08 +00:00
Jim Miller
d7e4cd9b1e am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev 
* commit 'f7fc6429874fd02bc3670bce98b2158d2a78aecd':
  Don't attempt to remove fp templates if none are enrolled
 2015-08-25 23:18:54 +00:00
Jim Miller
f7fc642987 Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev 2015-08-25 23:08:55 +00:00
Wei Liu
7023811447 am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib. 
* commit '6e58d516f05bbceabdddd3aa08a94fcc32858e71':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
 2015-08-25 18:32:41 +00:00
Wei Liu
ad50b81f49 am 0e309b86: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev 
* commit '0e309b867d1872b8cd0d6d435e10d6d3be48a3bd':
  Move SummaryForAllUidLoader to SettingsLib.
 2015-08-25 18:03:37 +00:00
Wei Liu
6e58d516f0 Refactor UidDetailProvider and its dependencies to SettingsLib. 
so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
 2015-08-25 11:02:59 -07:00
Wei Liu
0e309b867d Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev 2015-08-25 17:55:31 +00:00
Wei Liu
8dffd150c4 Move SummaryForAllUidLoader to SettingsLib. 
In order to show the data usage per app on Android Wear,
I'm moving SummaryForAllUidLoader to SettingsLib so that
the code can be reused.

Change-Id: I1833492d4a3b513405bfc1069b8656d04dd37c48
 2015-08-24 11:47:27 -07:00
Sanket Padawe
226dec509d am 8b58dc57: am 1a9626f0: am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev 
* commit '8b58dc577cc86af08f350c46f7059566fdc54961':
  Avoid new network to connect by using "Add Network" instead only Save it.
 2015-08-24 18:12:57 +00:00
Sanket Padawe
8b58dc577c am 1a9626f0: am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev 
* commit '1a9626f056d253aa25fca561010624c463bbf9a9':
  Avoid new network to connect by using "Add Network" instead only Save it.
 2015-08-24 18:05:59 +00:00
Sanket Padawe
1a9626f056 am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev 
* commit '3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
  Avoid new network to connect by using "Add Network" instead only Save it.
 2015-08-24 17:59:07 +00:00
Sanket Padawe
3be6d0b44b Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev 2015-08-24 17:52:51 +00:00
Geoff Mendal
8466a365b3 am d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translations. DO NOT MERGE 
* commit 'd8fd1cd7d93ff4a86ae0277b2fb27c864eca252d':
  Import translations. DO NOT MERGE
 2015-08-24 14:41:35 +00:00
Geoff Mendal
d8fd1cd7d9 am 9a86c085: (-s ours) Import translations. DO NOT MERGE 
* commit '9a86c08593d8fd3e5bb4a20f1705c3a803e67a5e':
  Import translations. DO NOT MERGE
 2015-08-24 14:29:57 +00:00
Geoff Mendal
9a86c08593 Import translations. DO NOT MERGE 
Change-Id: I14e14a1e5f548b559939584de4a209990318f799
Auto-generated-cl: translation import
 2015-08-24 07:16:24 -07:00
Jim Miller
c2f6813a83 Don't attempt to remove fp templates if none are enrolled 
The code was blindly calling fpm.remove(0) to remove all
fingerprint templates and then waiting for them to be removed.

Fixes bug 23183484

Change-Id: Ie510097d85bba32d965ba3c7f324f6c042e08300
 2015-08-21 18:07:50 -07:00
Christopher Tate
b20e1b6cca am c9d5bfcb: am 5d187aa4: am ffe701dc: Present the security patch date in a human-friendly format 
* commit 'c9d5bfcb96ae8b1ed6128c03b4f9efd10d6f3b40':
  Present the security patch date in a human-friendly format
 2015-08-22 00:27:20 +00:00
Christopher Tate
c9d5bfcb96 am 5d187aa4: am ffe701dc: Present the security patch date in a human-friendly format 
* commit '5d187aa43d262582241cd3a7097fc2fda0c875e6':
  Present the security patch date in a human-friendly format
 2015-08-22 00:16:24 +00:00
Sanket Padawe
e0ece963c6 Avoid new network to connect by using "Add Network" instead only Save it. 
Bug: 23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
 2015-08-21 16:45:30 -07:00