PauloftheWest
0b8788aae4
Fixed a SIM Lock UI issue
...
+ The SIM lock option will now appear if there is any SIM with locking
capabilities.
+ Also, if the first slot does not have a SIM in it, then the SIM lock
screen will disable the ability to lock the first slot.
Bug: 18473536
Change-Id: Ib4e0ed6e94b00bc07c9febdad433fdb3c55294b8
2014-12-08 13:51:25 -08:00
John Spurlock
1e3be7d9ce
Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
2014-12-08 20:27:02 +00:00
PauloftheWest
c29c583536
Fixed a SIM Cards crash.
...
+ Added a check if getActiveSubscriptionInfoList returns null.
Bug: 18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
2014-12-08 12:24:28 -08:00
John Spurlock
aaaa54ec0e
Settings: Rebind to volume sliders after returning from stopped.
...
Bug: 18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
2014-12-08 15:20:33 -05:00
Jeff Sharkey
e5c7baec2b
am e0d9f74d
: am 14ff2f7c
: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
...
* commit 'e0d9f74d270cc17eb92bea26b3b98eb4c9201ddd':
Offer to "merge" subscribers for data usage.
2014-12-08 19:44:34 +00:00
PauloftheWest
d54211c76d
am 5acd934b
: am 2a56b194
: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
...
* commit '5acd934b71f9fd96a46a189c3352191c2998883b':
SIM cards in Setting will only show on Multi-SIM devices
2014-12-08 19:43:59 +00:00
PauloftheWest
6f55eb72f4
am 743e8259
: am a2f69987
: Merge "Fixed a SimSettings issue" into lmp-mr1-dev
...
* commit '743e825934829be58027afac88c5ab8810c5b29b':
Fixed a SimSettings issue
2014-12-08 19:43:57 +00:00
John Spurlock
d88871564f
am 65802e5a
: am f68bc645
: Settings: Hide downtime settings if not supported.
...
* commit '65802e5acbbb22f68b7a5c75a34decaa366fe157':
Settings: Hide downtime settings if not supported.
2014-12-08 19:43:45 +00:00
Geoff Mendal
5e833090d8
am 2193e589
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '2193e589caebd5ea80aa4dda526402ea25230c2f':
Import translations. DO NOT MERGE
2014-12-08 19:42:57 +00:00
Geoff Mendal
63f6520ce9
am be183dac
: (-s ours) am 838d6dc9
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'be183dacbd87671243f328d589b519990c24939f':
Import translations. DO NOT MERGE
2014-12-08 19:42:43 +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
PauloftheWest
6f341b2c3e
Added Multi-SIM capability to Access Point Names
...
+ In Settings->More->Cellular networks->AccessPoint Names will display
the APNs for the selected SubscriptionInfo.
Bug: 18246837
Change-Id: If8f46c2fa82cf4b2051ddb5f15afc8c59cb9b850
2014-12-08 10:48:20 -08:00
Jeff Sharkey
e0d9f74d27
am 14ff2f7c
: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
...
* commit '14ff2f7c30b8258807f44afb815ccc71dc574c1c':
Offer to "merge" subscribers for data usage.
2014-12-08 18:04:09 +00:00
Jeff Sharkey
14ff2f7c30
Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
2014-12-08 17:57:30 +00:00
PauloftheWest
5acd934b71
am 2a56b194
: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
...
* commit '2a56b1943f10beea189fa8ec5478981e6b704b42':
SIM cards in Setting will only show on Multi-SIM devices
2014-12-08 17:08:09 +00:00
PauloftheWest
743e825934
am a2f69987
: Merge "Fixed a SimSettings issue" into lmp-mr1-dev
...
* commit 'a2f699871eb01c6d8464699eb8808c33de15f438':
Fixed a SimSettings issue
2014-12-08 17:08:08 +00:00
PauloftheWest
2a56b1943f
Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
2014-12-08 17:01:35 +00:00
PauloftheWest
a2f699871e
Merge "Fixed a SimSettings issue" into lmp-mr1-dev
2014-12-08 17:01:23 +00:00
John Spurlock
65802e5acb
am f68bc645
: Settings: Hide downtime settings if not supported.
...
* commit 'f68bc6459352cf585b2cbb1c9e0c9b54e1936daa':
Settings: Hide downtime settings if not supported.
2014-12-08 16:57:26 +00:00
Jeff Sharkey
4e2d16cdc0
Offer to "merge" subscribers for data usage.
...
When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.
Also remove some code related to long-dormant split policies.
Bug: 18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391
2014-12-08 08:42:12 -08:00
John Spurlock
f68bc64593
Settings: Hide downtime settings if not supported.
...
Depends on frameworks/base:
I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
Bug: 16373455
Change-Id: I88b526d947fb697a7abd4d4cf4225f926434915a
2014-12-08 11:00:47 -05:00
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