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

23858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Geoff Mendal
10c447c2cd am 532ebb9f: (-s ours) am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE 
* commit '532ebb9f7afaf512567811fe8cdb9b74376b00c2':
  Import translations. DO NOT MERGE
 2015-09-03 06:21:36 +00:00
Jorim Jaggi
bfacb5f483 am 98d91550: am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev 
* commit '98d91550b624ca942fea7d096835c5bdf73f9af2':
  Fix fingerprint settings ripples
 2015-09-03 01:37:47 +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
84afdfdefa am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit '82db64e940905a18aae4e716f361b6a9a72d0a4e':
  [Fingerprint] Update strings for skip dialog
 2015-09-02 23:54:52 +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
a43a40ffe7 am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit 'e31208ae1c253b35edd34192f49c14a59bbd8c13':
  To hide none security option, use config_hide_none_security_option config
 2015-09-02 21:25:25 +00:00
Xiaohui Chen
2f138f87f1 Merge "Cleanup USER_OWNER in Settings" 2015-09-02 21:08:45 +00: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
Geoff Mendal
532ebb9f7a am 8ee8b379: (-s ours) am e182fa77: (-s ours) Import translations. DO NOT MERGE 
* commit '8ee8b37933b52d8f495cb9317b02f4843aa090bb':
  Import translations. DO NOT MERGE
 2015-09-02 14:28:48 +00:00
Geoff Mendal
8ee8b37933 am e182fa77: (-s ours) Import translations. DO NOT MERGE 
* commit 'e182fa77888d0b42b4896f031e7b1d8c88a62a4c':
  Import translations. DO NOT MERGE
 2015-09-02 14:18:54 +00:00
Geoff Mendal
e182fa7788 Import translations. DO NOT MERGE 
Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce
Auto-generated-cl: translation import
 2015-09-02 07:05:31 -07:00
Geoff Mendal
c638c8f7b3 Import translations. DO NOT MERGE 
Change-Id: I594aadd6ad5c196e88e6bf08fb46ff8e3964482f
Auto-generated-cl: translation import
 2015-09-02 06:20:12 -07:00
Xiyuan Xia
beebc95884 am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 
* commit '676a4b65b18a97851c6762446b8236ca941cd0a3':
  Fix races in ConfirmPassword/Pattern
 2015-09-01 20:53:56 +00: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
Jason Monk
2ffca0c52a am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev 
* commit 'b39ceab718f0265be3c7e8bf9df1ab0917b5307b':
  Protect against multiple provision responses
 2015-09-01 19:21:03 +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
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
Geoff Mendal
daf2901a1a am 938cf6f8: (-s ours) am 9cc1143d: (-s ours) am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE 
* commit '938cf6f863cdbead814d27a7f6647d1fcc79474e':
  Import translations. DO NOT MERGE
 2015-09-01 16:07:17 +00: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
96c4330eef Import translations. DO NOT MERGE 
Change-Id: I39fa6b9b72e50d1ded02a2701ac6ac989a31861b
Auto-generated-cl: translation import
 2015-08-31 06:23:03 -07:00
Geoff Mendal
efd3a20ce9 am 7baf9a3e: (-s ours) am f7a20d53: (-s ours) am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE 
* commit '7baf9a3e8a7c9c7e27262bc30cdccdde049bf031':
  Import translations. DO NOT MERGE
 2015-08-29 23:19:04 +00: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