PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,688 Commits 1 Branch 0 Tags
77d7e17fba66f69f0e813a1580df664c340be9d7
Commit Graph

18688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
77d7e17fba am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
automerge: 45f0423

* commit '45f04233c22231d3216ceb9a1a7cc5b09cf45401':
  Make Location Settings multiprofile aware
 2014-12-09 23:15:46 +00:00
Lucky Zhang
a62e42be14 am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 
automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
  [FRP] Screen Lock for Setup Wizard shows wrong title
 2014-12-09 23:15:37 +00:00
Lucky Zhang
64192c36fa am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
automerge: a4df967

* commit 'a4df9673896bf7fb317b8ae92246b555d712a79d':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-09 23:15:29 +00:00
Maurice Lam
00a89f1439 am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev 
automerge: 86ed2cf

* commit '86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f':
  [FRP] Don't extract IME for PIN / Password during setup
 2014-12-09 23:15:21 +00:00
Jeff Davidson
06b65d1c7d resolve merge conflicts of 0c7e4ed to master. 
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
 2014-12-09 15:11:44 -08:00
Maurice Lam
2a321adc9b am 2dded568: am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '2dded568fe0afbc18dda0a5abd0afa6911558dee':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-09 00:55:49 +00:00
Sanket Padawe
8b8ae61d52 am 088a4420: am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 
* commit '088a44205d2b4a7c2add44f9109f209b50c0f3b9':
  Removing checks from EnableWifiTether which are done in SystemUI
 2014-12-09 00:55:48 +00:00
Sanket Padawe
ded7054794 am 361681e2: am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 
* commit '361681e2579f36765c1a75d7898f73b0fd2c1322':
  Change default sim selection text in sim settings ui.
 2014-12-09 00:55:47 +00:00
Justin Harrison
3cb00b23aa am 765bf45f: am 07d60e5e: am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 
* commit '765bf45f9714f0857bc0de081ed9c938ebf810f5':
  Check remote device uuids for phone book access permission
 2014-12-09 00:55:45 +00:00
Fyodor Kupolov
ed682b7f18 am 2b6c7313: am d7e3f354: am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 
* commit '2b6c7313ede33b40515f41ea97d3bed0532d1518':
  Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
 2014-12-09 00:55:44 +00:00
Shishir Agrawal
5615a1b3b6 am 4d3eb665: am 5cfc97a9: am 0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 
* commit '4d3eb6659eb6626dd3ed5d46b681ddf27845a4fe':
  Settings app - read phone number from TelephonyManager.
 2014-12-09 00:55:43 +00:00
Adrian Roos
19805a3cca am 669dd0a3: am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 
* commit '669dd0a3aa916994fb821e7036e7c4bd12a033a1':
  Fix race leading to spuriously disabled trust agents
 2014-12-09 00:55:41 +00:00
Maurice Lam
4dd6de9228 am 5c325c4d: am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 
* commit '5c325c4d8cd9a0c1195b3d02b31f6073fbff09a2':
  [FRP] Use setup wizard nav bar buttons
 2014-12-09 00:55:40 +00:00
Justin Harrison
15f8bf6278 am de54a3ae: am 9704e3d6: am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev 
* commit 'de54a3aef60f2d3d1f143ba5bb1ecdd4b9cf3a9e':
  Removed the application SIM Cards from application list
 2014-12-09 00:55:39 +00:00
Maurice Lam
10a4d5c2de am 3d9267f3: am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 
* commit '3d9267f307ea484a46b95c80ac501fc4ee1fc4c2':
  [FRP] Add illustration to lock screen setup
 2014-12-09 00:55:37 +00:00
Maurice Lam
2e07b9e83e am 5d7cef31: am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev 
* commit '5d7cef31bc9aede1ebe2ce64906b2a7766d94c99':
  [FRP] Give pattern lock colors
 2014-12-09 00:55:36 +00:00
Zoltan Szatmary-Ban
45f04233c2 am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
* commit '5d653fe85a030b41d7d4d946feca12ea897c4457':
  Make Location Settings multiprofile aware
 2014-12-08 19:42:19 +00:00
Lucky Zhang
44f44a0c54 am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 
* commit '90ec22bc2c47e01bbf3179ec947fa30f3ab45724':
  [FRP] Screen Lock for Setup Wizard shows wrong title
 2014-12-08 19:41:45 +00:00
Lucky Zhang
a4df967389 am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
* commit '3e239fe0d8b09b950e87339a1814040bb4208fe2':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-08 19:41:44 +00:00
Maurice Lam
86ed2cf33f am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev 
* commit '8fcbe816656a61bcb6b5c34e7bd535a5bba9964d':
  [FRP] Don't extract IME for PIN / Password during setup
 2014-12-08 19:37:12 +00:00
Jeff Davidson
0c7e4ed697 am e2381760: am 9dc247bb: Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev 
* commit 'e2381760207f3826ed54ecf4f27a7d10eb340166':
  Final platform settings UX for ephemeral networks.
 2014-12-08 19:36:47 +00:00
Maurice Lam
2dded568fe am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '53bfcb526b218758d51ca47e57f71e2e19de4d3c':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-08 19:18:16 +00:00
Sanket Padawe
088a44205d am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 
* commit '32fc975534e3a14128f9c9303665c1a4a3fc4937':
  Removing checks from EnableWifiTether which are done in SystemUI
 2014-12-08 19:17:50 +00:00
Sanket Padawe
361681e257 am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 
* commit '889d3875af9235f8f5330e2fec3e2fd7d7ef22e0':
  Change default sim selection text in sim settings ui.
 2014-12-08 19:17:49 +00:00
Justin Harrison
765bf45f97 am 07d60e5e: am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 
* commit '07d60e5ec237d5d4e96893bae866215a374f6452':
  Check remote device uuids for phone book access permission
 2014-12-08 19:16:45 +00:00
Fyodor Kupolov
2b6c7313ed am d7e3f354: am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 
* commit 'd7e3f354cc975b4ade2bd5bddfa72dce3099581f':
  Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
 2014-12-08 19:16:06 +00:00
Shishir Agrawal
4d3eb6659e am 5cfc97a9: am 0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 
* commit '5cfc97a9776c7a53da35e563e80ba0ec7f1f0c70':
  Settings app - read phone number from TelephonyManager.
 2014-12-08 19:16:05 +00:00
Adrian Roos
669dd0a3aa am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 
* commit 'f39a0988ef56adb86aae7c2036b53819c3fe8b52':
  Fix race leading to spuriously disabled trust agents
 2014-12-08 19:15:30 +00:00
Maurice Lam
5c325c4d8c am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 
* commit 'ecf2f401e9f0de62f318d7e9e4749d3a33ed57fc':
  [FRP] Use setup wizard nav bar buttons
 2014-12-08 19:14:06 +00:00
Justin Harrison
de54a3aef6 am 9704e3d6: am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev 
* commit '9704e3d6bad217f9981577e748b16ed7820b768e':
  Removed the application SIM Cards from application list
 2014-12-08 19:13:27 +00:00
Maurice Lam
3d9267f307 am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 
* commit '40a252ce499fd1377da6b64cbd785d4ca1c55727':
  [FRP] Add illustration to lock screen setup
 2014-12-08 19:12:12 +00:00
Maurice Lam
5d7cef31bc am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev 
* commit 'b6f5e003a9167c44155906235762f2fac890c66a':
  [FRP] Give pattern lock colors
 2014-12-08 19:10:20 +00:00
Geoff Mendal
3260f78cb5 Import translations. DO NOT MERGE 
Change-Id: Ide3e406681ef2f9a6198de5436f4cd1df3888282
Auto-generated-cl: translation import
 2014-12-08 06:51:46 -08:00
Zoltan Szatmary-Ban
5d653fe85a am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 
* commit 'f84c6ee01c09b25d78c48cdf6bde5be4e334758c':
  Make Location Settings multiprofile aware
 2014-12-08 12:55:55 +00:00
Zoltan Szatmary-Ban
f84c6ee01c Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 2014-12-08 12:50:11 +00:00
Lucky Zhang
90ec22bc2c am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 
* commit '071171476aeb869d40a5247e09759d7049cda239':
  [FRP] Screen Lock for Setup Wizard shows wrong title
 2014-12-08 10:11:52 +00:00
Lucky Zhang
3e239fe0d8 am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 
* commit '73ae2d3adca786efed712e088b03c520fe7e9790':
  [FRP] Remove None and Swipe from screen lock options
 2014-12-08 10:11:50 +00:00
Lucky Zhang
071171476a Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev 2014-12-08 09:32:00 +00:00
Lucky Zhang
73ae2d3adc Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 2014-12-08 09:31:46 +00:00
Maurice Lam
8fcbe81665 am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev 
* commit '400e93785016cce831b14990365ab7636b846648':
  [FRP] Don't extract IME for PIN / Password during setup
 2014-12-06 03:10:19 +00:00
Maurice Lam
400e937850 Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev 2014-12-06 03:03:56 +00:00
Lucky Zhang
df8566a9a1 [FRP] Remove None and Swipe from screen lock options 
Removed "None" and "Swipe" from screen lock options in the choosing
lock screen during setup wizard, because at this step, the user has
already chosen to pick a screen lock, hence it's unnecessory to show
"none" and "swipe".

Implemented this by overriding the DisableUnusablePreferences in
SetupChooseLockGenericFragment to disable the insecure lock methods
and adding a flag to hide disabled methods for setup wizard.

Bug: 18631416
Change-Id: I3feccf591da25bd6eadcc03c75b28cfc1d069db7
 2014-12-05 18:50:55 -08:00
Lucky Zhang
36ec274e73 [FRP] Screen Lock for Setup Wizard shows wrong title 
Changed to the string lock_setting_picker_title that says "Choose a
screen lock".

Bug: 18631416
Change-Id: I2e400f3fdf7e89d4e70a60e1aec6df9ed77653b2
 2014-12-05 18:20:27 -08:00
Jeff Davidson
e238176020 am 9dc247bb: Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev 
* commit '9dc247bba248ac6329b6e0a5b42ac8ef4c8c4a3e':
  Final platform settings UX for ephemeral networks.
 2014-12-06 02:16:41 +00:00
Jeff Davidson
9dc247bba2 Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev 2014-12-06 02:07:31 +00:00
Maurice Lam
53bfcb526b am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 
* commit '7dca460af7a6a9d683ea398c6eb2e3f784aa6900':
  [FRP] Use Lock type as header instead of "Encryption"
 2014-12-05 22:12:51 +00:00
Maurice Lam
7dca460af7 Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 2014-12-05 21:57:00 +00:00
Sanket Padawe
32fc975534 am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 
* commit 'fc988c03e11eba66ca28f6dbec6d889535638bbb':
  Removing checks from EnableWifiTether which are done in SystemUI
 2014-12-05 21:03:36 +00:00
Sanket Padawe
889d3875af am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 
* commit '6d0059c3f998a86b1726949525d3501d5b7cf589':
  Change default sim selection text in sim settings ui.
 2014-12-05 21:03:35 +00:00
Sanket Padawe
fc988c03e1 Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 2014-12-05 20:55:43 +00:00