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

9724 Commits

Author SHA1 Message Date
Xiaohui Chen
cb9997fd68 Merge "Remove dead Nsd checkbox" 2015-09-04 17:42:35 +00:00
Xiaohui Chen
1466d901f1 Merge "Cleanup remaining USER_OWNER in Settings" 2015-09-04 17:42:22 +00:00
Jason Monk
12d29a96a0 am 7af285b3: am 3f2ac58c: am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev 
* commit '7af285b3fc8638f2caba31bb4a91e7cf9535f263':
  Start tether service with redeliver intent
 2015-09-03 18:46:50 +00:00
Jason Monk
7af285b3fc am 3f2ac58c: am 07b26bb3: am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev 
* commit '3f2ac58c932311fa61bc848af7aceec6f0f3a63d':
  Start tether service with redeliver intent
 2015-09-03 18:36:00 +00:00
Xiaohui Chen
40aca2ceb4 Remove dead Nsd checkbox 
It seems to be dead from few years ago. This cl just cleans things up.
See b/6449478 for context.

Change-Id: Ida5eca16df88c866d3557e12dcde8884706810c6
 2015-09-03 11:29:45 -07:00
Jason Monk
07b26bb3fc am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev 
* commit '1cfaf01fdaba22884a126a84748cf3a619785b3e':
  Start tether service with redeliver intent
 2015-09-03 18:14:51 +00:00
Jason Monk
1cfaf01fda Merge "Start tether service with redeliver intent" into mnc-dr-dev 2015-09-03 17:51:09 +00:00
Xiaohui Chen
6f03829e74 Cleanup remaining USER_OWNER in Settings 
Bug: 19913735
Change-Id: I6894a7c81ed7504b02d533d9e9f65f800dbca895
 2015-09-03 10:31:34 -07:00
Jorim Jaggi
98e3af770d am 469447bb: am bfacb5f4: am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit '469447bb8c7a252034750aa215e809a45413e732':
  Fix fingerprint settings ripples
 2015-09-03 17:28:46 +00:00
Maurice Lam
321b27b67c am 570852da: am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit '570852da1875ad34d6d1b751e2bacaee8d7a9a1a':
  [Fingerprint] Update strings for skip dialog
 2015-09-03 17:28:44 +00:00
Sungmin Choi
56042b8c36 am eeb5f8f1: am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit 'eeb5f8f1a2d31a9231ebb96ce55abe2213900377':
  To hide none security option, use config_hide_none_security_option config
 2015-09-03 17:28:43 +00:00
Jason Monk
09ea9724fa Start tether service with redeliver intent 
So that the intent comes back when we are restarted rather than
null causing a crash.

Bug: 23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
 2015-09-03 12:50:01 -04:00
Jorim Jaggi
469447bb8c am bfacb5f4: am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit 'bfacb5f483b6fe8c117d8df9ab0a1bbe3909df26':
  Fix fingerprint settings ripples
 2015-09-03 06:23:58 +00:00
Maurice Lam
570852da18 am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit '84afdfdefaa935764aff589799b3ccf3a2fa06a1':
  [Fingerprint] Update strings for skip dialog
 2015-09-03 06:23:36 +00:00
Sungmin Choi
eeb5f8f1a2 am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit 'a43a40ffe7e55a4421635fc0a47ede295f2d61ed':
  To hide none security option, use config_hide_none_security_option config
 2015-09-03 06:22:57 +00:00
Jorim Jaggi
98d91550b6 am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit 'c624a72be19027a0784fb41575129b334ff02ae7':
  Fix fingerprint settings ripples
 2015-09-03 01:28:51 +00:00
Jorim Jaggi
c624a72be1 Merge "Fix fingerprint settings ripples" into mnc-dr-dev 2015-09-03 01:19:28 +00:00
Xiyuan Xia
c31bfb2dca am 6642a642: am beebc958: am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit '6642a642109b088d9b29f4374d55749c9c000995':
  Fix races in ConfirmPassword/Pattern
 2015-09-03 00:44:18 +00:00
Jorim Jaggi
1e2433693a Fix fingerprint settings ripples 
Bug: 22471044
Bug: 23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
 2015-09-02 17:42:29 -07:00
Xiyuan Xia
6642a64210 am beebc958: am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit 'beebc95884e15bc53594a6fa63e1dd7736eb4b93':
  Fix races in ConfirmPassword/Pattern
 2015-09-03 00:34:15 +00:00
Maurice Lam
82db64e940 am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
  [Fingerprint] Update strings for skip dialog
 2015-09-02 23:44:06 +00:00
Maurice Lam
d8723073bb Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 2015-09-02 23:35:15 +00:00
Lifu Tang
02b86a3426 Merge "Created new task when launching injected activity" 2015-09-02 21:54:13 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog 
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
 2015-09-02 14:36:19 -07:00
Sungmin Choi
e31208ae1c am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit '05c7dde1f3a6044db7b687dfcbacbde50f3befb1':
  To hide none security option, use config_hide_none_security_option config
 2015-09-02 21:02:58 +00:00
Sungmin Choi
05c7dde1f3 To hide none security option, use config_hide_none_security_option config 
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
 2015-09-02 13:51:44 -07:00
Xiyuan Xia
676a4b65b1 am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit '50e1f59a6891cbf3995db0e7fc811f018f9ba63a':
  Fix races in ConfirmPassword/Pattern
 2015-09-01 20:39:58 +00:00
Xiyuan Xia
50e1f59a68 Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 2015-09-01 20:29:41 +00:00
Xiaohui Chen
762104ea5d Cleanup USER_OWNER in Settings 
This cl updates a couple places related to managed profiles.

Bug: 19913735
Change-Id: I72b5315885fc34d8716339ecc18447c15867a5ac
 2015-09-01 13:23:48 -07:00
Jason Monk
b600e38d48 am de750e8c: am 2ffca0c5: am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit 'de750e8cf11a30045ee454c5f0d6d1de9ccdcc64':
  Protect against multiple provision responses
 2015-09-01 19:40:03 +00:00
Jason Monk
de750e8cf1 am 2ffca0c5: am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit '2ffca0c52a770dfe610d492fa9ba8328b79c85f7':
  Protect against multiple provision responses
 2015-09-01 19:28:25 +00:00
Xiyuan Xia
9d650a28fc am 4e485080: am 060ce6b5: am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit '4e4850802b8be707e15f4e31327f26b5f34eac0a':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 19:26:27 +00:00
Xiyuan Xia
4e4850802b am 060ce6b5: am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 
* commit '060ce6b5a77e629a1a317f7fe4c2c62fc5ed3c04':
  Fix wrong stage exception in ChooseLockPattern
 2015-09-01 19:15:28 +00:00
Jason Monk
b39ceab718 am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit '65b0666d36896c0c5616f867af5396c036ed1cb6':
  Protect against multiple provision responses
 2015-09-01 19:10:12 +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
Fyodor Kupolov
20f6f0d31f Merge "Use createRestrictedProfile method to create profile" 2015-08-29 00:08:20 +00:00
Fyodor Kupolov
9938f6fa45 Use createRestrictedProfile method to create profile 
Bug: 23191995
Change-Id: I83d900b274563dc964fd07dbd0fccbdb4b275f29
 2015-08-28 17:02:21 -07:00
Maurice Lam
566af8ce2a am 2fef0595: am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 
* commit '2fef059543bc859d5723246a635d0e1773f623de':
  [Fingerprint] Add skip dialog during SUW
 2015-08-28 22:48:17 +00: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
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
Xiaohui Chen
47a82b5d6d Merge "Cleanup USER_OWNER for cryptkeeper" 2015-08-28 20:35:24 +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
Xiyuan Xia
f8c1636807 am 12ec7efe: am e053491b: am e927bd70: am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 
* commit '12ec7efeb3efcaba014f9c23f0e1505d218996d4':
  Fix ChoosePat/Pin/Pwd crash from async task
 2015-08-28 02:09:11 +00: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