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

18862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
2193e589ca Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-08 14:42:26 +00:00
Geoff Mendal
7f530b3350 Import translations. DO NOT MERGE 
Change-Id: Ib5799918393320abc01ef481068d943b716451f9
Auto-generated-cl: translation import
 2014-12-08 06:41:08 -08:00
Geoff Mendal
be183dacbd am 838d6dc9: (-s ours) Import translations. DO NOT MERGE 
* commit '838d6dc94970201792bc825091c9b520fb96821a':
  Import translations. DO NOT MERGE
 2014-12-08 14:36:05 +00:00
Geoff Mendal
838d6dc949 Import translations. DO NOT MERGE 
Change-Id: I961eb0c06458b16d134c52d5748954f7c359b053
Auto-generated-cl: translation import
 2014-12-08 06:25:15 -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
Wink Saville
a4f4d185cf Add debug dataEnable. 
Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
 2014-12-05 15:34:46 -08: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
Sanket Padawe
6d0059c3f9 Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 2014-12-05 20:55:29 +00:00
Maurice Lam
0973c31db1 [FRP] Use Lock type as header instead of "Encryption" 
Bug: 18631620
Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1
 2014-12-05 12:19:05 -08:00
Justin Harrison
07d60e5ec2 am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 
* commit '0612a48563f35a13f06c8bc1ebb8758e0bc3acc6':
  Check remote device uuids for phone book access permission
 2014-12-05 19:49:05 +00:00
Justin Harrison
0612a48563 Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 2014-12-05 19:41:55 +00:00
Zoltan Szatmary-Ban
86c877e9b6 Make Location Settings multiprofile aware 
Injected location services and location access status are shown
for managed profiles on Settings > Location

Bug: 18602878
Change-Id: Ic6232f3dc03d9675b90fbfd0163fe5bae4bd13c6
 2014-12-05 19:40:59 +00:00
Fyodor Kupolov
d7e3f354cc am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 
* commit 'd4057cc312feca00eac73f908788799ab567d8a1':
  Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
 2014-12-05 19:32:35 +00:00
Shishir Agrawal
5cfc97a977 am 0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 
* commit '0b1f606c6e79a3a891a19e88ece48d9852081714':
  Settings app - read phone number from TelephonyManager.
 2014-12-05 19:32:34 +00:00
Fyodor Kupolov
d4057cc312 Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 2014-12-05 19:28:43 +00:00
Shishir Agrawal
0b1f606c6e Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 2014-12-05 19:25:59 +00:00
PauloftheWest
a754c6ba05 am d831733f: am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 
* commit 'd831733fabc672842e5519d724c05c8b835824b6':
  Fixed a Settings crash when entering SIM status
 2014-12-05 19:21:45 +00:00
Maurice Lam
4170f0e567 [FRP] Don't extract IME for PIN / Password during setup 
Add the flagNoExtractUi to the password / PIN entry field so that it
will not be extracted to a fullscreen mode in phone landscape.

The phone landscape UI currently provides a poor experience because
it masks the message shown to the user (e.g. Passwords require at
least 4 characters)

Bug: 18640065
Change-Id: If67c8f9ae761f1ffda4f841e421e0fd651651649
 2014-12-05 11:14:01 -08:00
PauloftheWest
d831733fab am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 
* commit '651474d0275f9d7cd10cdd6e0afb7dd107e66335':
  Fixed a Settings crash when entering SIM status
 2014-12-05 19:12:44 +00:00
Adrian Roos
f39a0988ef am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 
* commit '5df6e0302c242b801eee73a513ba04a79f508c2e':
  Fix race leading to spuriously disabled trust agents
 2014-12-05 18:32:02 +00:00
Adrian Roos
5df6e0302c Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 2014-12-05 18:25:59 +00:00
Jeff Davidson
5ead6b92fd Final platform settings UX for ephemeral networks. 
Show "Connected via Wi-Fi assistant" instead of just "Connected" when
a Wi-Fi connection is ephemeral. Otherwise, treat ephemeral
connections just like saved ones - show (read-only) connection stats
when you click the network, and offer the ability to "forget" the
network, which prevents further ephemeral connections.

Bug: 18525241
Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
 2014-12-05 10:14:41 -08:00
Adrian Roos
16809b1ad7 Fix race leading to spuriously disabled trust agents 
If TrustManagerService is able to refresh the trust agents before
the Settings activity gets a chance to reenable the lock pattern,
the TrustManagerService won't see a secure credential and won't
load any agents. This was introduced when we switched to isSecure
instead of getKeyguardStoredPasswordQuality. The latter ignored
the lockPatternEnabled flag.

Bug: 18596036
Change-Id: I2734899f7684916fc84bc3a07edca29310887103
 2014-12-05 18:47:20 +01:00
Sanket Padawe
9a73365ed7 am 76fd9d62: am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '76fd9d62facb2c683b69c2e4280534abdb2281bd':
  Removed unnecessary heading in Sim settings
 2014-12-05 16:26:39 +00:00
Sanket Padawe
76fd9d62fa am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '669d4e4fce68d3f8e6391fab5d4e60e358234767':
  Removed unnecessary heading in Sim settings
 2014-12-05 15:52:03 +00:00
Maurice Lam
ecf2f401e9 am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 
* commit '2c0c983755903bf9c0a5cb276c64ed7cf4557464':
  [FRP] Use setup wizard nav bar buttons
 2014-12-05 03:27:17 +00:00
Maurice Lam
2c0c983755 Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 2014-12-05 03:21:53 +00:00
Justin Harrison
9704e3d6ba am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev 
* commit '03cceb329366796a64cfb86b03fe0c08b06f852b':
  Removed the application SIM Cards from application list
 2014-12-05 02:25:42 +00:00
Justin Harrison
03cceb3293 Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev 2014-12-05 02:17:24 +00:00
Maurice Lam
40a252ce49 am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 
* commit 'dfaf4c92c19356116267cf9c61168414d817b9a7':
  [FRP] Add illustration to lock screen setup
 2014-12-05 00:32:53 +00:00
Maurice Lam
dfaf4c92c1 Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 2014-12-05 00:23:00 +00:00
Geoff Mendal
94eb04617f am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'eb5b7721df47a601d3707a7bcbf32d61efe09c5b':
  Import translations. DO NOT MERGE
 2014-12-05 00:14:20 +00:00
Amith Yamasani
0c8a2d63be am a7ddb536: am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 
* commit 'a7ddb536fd9ed69f8436f1f786ca576fd34effa3':
  Fix padding in user type selection dialog
 2014-12-05 00:14:14 +00:00
Maurice Lam
7b6801af7c am 73a68c07: am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 
* commit '73a68c0727fbc2caa85109eea17e2b583c5905c1':
  [FRP] Transitions for lock screen setup
 2014-12-05 00:14:13 +00:00
Wink Saville
05e3147192 am 527c7dbc: am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 
* commit '527c7dbcc74a79b18c0c82a9778da49ba894e56d':
  Change initMobileTabTag to use subInfoList
 2014-12-05 00:14:11 +00:00