OSDN Git Service
PauloftheWest [Tue, 9 Dec 2014 23:12:52 +0000 (23:12 +0000)]
am
e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
* commit '
e6d7b31fc44ef6f0865ef22401217b70a6676eaa':
Fixed a SIM Lock UI issue
PauloftheWest [Tue, 9 Dec 2014 23:04:18 +0000 (23:04 +0000)]
Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
Wink Saville [Tue, 9 Dec 2014 17:58:30 +0000 (17:58 +0000)]
am
85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev
* commit '
85d3b0fa6e2e8988f48a5a830dc3d279d05619fd':
Add debug dataEnable.
Wink Saville [Tue, 9 Dec 2014 17:52:19 +0000 (17:52 +0000)]
Merge "Add debug dataEnable." into lmp-mr1-dev
Prem Kumar [Tue, 9 Dec 2014 02:30:23 +0000 (02:30 +0000)]
am
1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
* commit '
1e1251cc04ee9636721719aa0a13d94e15500258':
Fixed a SIM Cards crash.
Prem Kumar [Tue, 9 Dec 2014 02:25:14 +0000 (02:25 +0000)]
Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
John Spurlock [Tue, 9 Dec 2014 00:08:42 +0000 (00:08 +0000)]
am
1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
* commit '
1e3be7d9ce27cf5ee7df78c675603a628eb0023d':
Settings: Rebind to volume sliders after returning from stopped.
PauloftheWest [Mon, 8 Dec 2014 21:49:35 +0000 (13:49 -0800)]
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
John Spurlock [Mon, 8 Dec 2014 20:27:01 +0000 (20:27 +0000)]
Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 20:23:34 +0000 (12:23 -0800)]
Fixed a SIM Cards crash.
+ Added a check if getActiveSubscriptionInfoList returns null.
Bug:
18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
John Spurlock [Mon, 8 Dec 2014 20:20:33 +0000 (15:20 -0500)]
Settings: Rebind to volume sliders after returning from stopped.
Bug:
18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
Jeff Sharkey [Mon, 8 Dec 2014 18:04:09 +0000 (18:04 +0000)]
am
14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit '
14ff2f7c30b8258807f44afb815ccc71dc574c1c':
Offer to "merge" subscribers for data usage.
Jeff Sharkey [Mon, 8 Dec 2014 17:57:29 +0000 (17:57 +0000)]
Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:08:09 +0000 (17:08 +0000)]
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
PauloftheWest [Mon, 8 Dec 2014 17:08:08 +0000 (17:08 +0000)]
am
a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev
* commit '
a2f699871eb01c6d8464699eb8808c33de15f438':
Fixed a SimSettings issue
PauloftheWest [Mon, 8 Dec 2014 17:01:35 +0000 (17:01 +0000)]
Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:01:22 +0000 (17:01 +0000)]
Merge "Fixed a SimSettings issue" into lmp-mr1-dev
John Spurlock [Mon, 8 Dec 2014 16:57:26 +0000 (16:57 +0000)]
am
f68bc645: Settings: Hide downtime settings if not supported.
* commit '
f68bc6459352cf585b2cbb1c9e0c9b54e1936daa':
Settings: Hide downtime settings if not supported.
Jeff Sharkey [Wed, 3 Dec 2014 21:44:26 +0000 (13:44 -0800)]
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
John Spurlock [Sun, 30 Nov 2014 21:22:09 +0000 (16:22 -0500)]
Settings: Hide downtime settings if not supported.
Depends on frameworks/base:
I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
Bug:
16373455
Change-Id: I88b526d947fb697a7abd4d4cf4225f926434915a
Geoff Mendal [Mon, 8 Dec 2014 14:42:26 +0000 (14:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 8 Dec 2014 14:41:08 +0000 (06:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib5799918393320abc01ef481068d943b716451f9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 8 Dec 2014 14:36:05 +0000 (14:36 +0000)]
am
838d6dc9: (-s ours) Import translations. DO NOT MERGE
* commit '
838d6dc94970201792bc825091c9b520fb96821a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 14:25:15 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I961eb0c06458b16d134c52d5748954f7c359b053
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:55:55 +0000 (12:55 +0000)]
am
f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
* commit '
f84c6ee01c09b25d78c48cdf6bde5be4e334758c':
Make Location Settings multiprofile aware
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:50:10 +0000 (12:50 +0000)]
Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 10:11:52 +0000 (10:11 +0000)]
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
Lucky Zhang [Mon, 8 Dec 2014 10:11:50 +0000 (10:11 +0000)]
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
Lucky Zhang [Mon, 8 Dec 2014 09:32:00 +0000 (09:32 +0000)]
Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 09:31:45 +0000 (09:31 +0000)]
Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
Maurice Lam [Sat, 6 Dec 2014 03:10:19 +0000 (03:10 +0000)]
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
Maurice Lam [Sat, 6 Dec 2014 03:03:55 +0000 (03:03 +0000)]
Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev
Lucky Zhang [Fri, 5 Dec 2014 23:00:20 +0000 (15:00 -0800)]
[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
Lucky Zhang [Sat, 6 Dec 2014 02:20:27 +0000 (18:20 -0800)]
[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
Jeff Davidson [Sat, 6 Dec 2014 02:16:41 +0000 (02:16 +0000)]
am
9dc247bb: Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev
* commit '
9dc247bba248ac6329b6e0a5b42ac8ef4c8c4a3e':
Final platform settings UX for ephemeral networks.
Jeff Davidson [Sat, 6 Dec 2014 02:07:30 +0000 (02:07 +0000)]
Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev
Wink Saville [Fri, 5 Dec 2014 23:34:46 +0000 (15:34 -0800)]
Add debug dataEnable.
Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
Maurice Lam [Fri, 5 Dec 2014 22:12:51 +0000 (22:12 +0000)]
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"
Maurice Lam [Fri, 5 Dec 2014 21:56:59 +0000 (21:56 +0000)]
Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 21:03:36 +0000 (21:03 +0000)]
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
Sanket Padawe [Fri, 5 Dec 2014 21:03:35 +0000 (21:03 +0000)]
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.
Sanket Padawe [Fri, 5 Dec 2014 20:55:42 +0000 (20:55 +0000)]
Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 20:55:28 +0000 (20:55 +0000)]
Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 20:19:05 +0000 (12:19 -0800)]
[FRP] Use Lock type as header instead of "Encryption"
Bug:
18631620
Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1
Justin Harrison [Fri, 5 Dec 2014 19:49:05 +0000 (19:49 +0000)]
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
Justin Harrison [Fri, 5 Dec 2014 19:41:54 +0000 (19:41 +0000)]
Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 15 Oct 2014 10:35:55 +0000 (11:35 +0100)]
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
Fyodor Kupolov [Fri, 5 Dec 2014 19:32:35 +0000 (19:32 +0000)]
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
Shishir Agrawal [Fri, 5 Dec 2014 19:32:34 +0000 (19:32 +0000)]
am
0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev
* commit '
0b1f606c6e79a3a891a19e88ece48d9852081714':
Settings app - read phone number from TelephonyManager.
Fyodor Kupolov [Fri, 5 Dec 2014 19:28:42 +0000 (19:28 +0000)]
Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev
Shishir Agrawal [Fri, 5 Dec 2014 19:25:59 +0000 (19:25 +0000)]
Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 19:14:01 +0000 (11:14 -0800)]
[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
Adrian Roos [Fri, 5 Dec 2014 18:32:02 +0000 (18:32 +0000)]
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
Adrian Roos [Fri, 5 Dec 2014 18:25:58 +0000 (18:25 +0000)]
Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:29:36 +0000 (15:29 -0800)]
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
Adrian Roos [Fri, 5 Dec 2014 17:47:12 +0000 (18:47 +0100)]
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
Maurice Lam [Fri, 5 Dec 2014 03:27:17 +0000 (03:27 +0000)]
am
2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
* commit '
2c0c983755903bf9c0a5cb276c64ed7cf4557464':
[FRP] Use setup wizard nav bar buttons
Maurice Lam [Fri, 5 Dec 2014 03:21:51 +0000 (03:21 +0000)]
Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
Justin Harrison [Fri, 5 Dec 2014 02:25:42 +0000 (02:25 +0000)]
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
Justin Harrison [Fri, 5 Dec 2014 02:17:23 +0000 (02:17 +0000)]
Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 00:32:53 +0000 (00:32 +0000)]
am
dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
* commit '
dfaf4c92c19356116267cf9c61168414d817b9a7':
[FRP] Add illustration to lock screen setup
Maurice Lam [Fri, 5 Dec 2014 00:22:59 +0000 (00:22 +0000)]
Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 23:13:50 +0000 (23:13 +0000)]
am
13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
* commit '
13989d6d9f25a5d09d68dfc98b31595e8e6b8425':
[FRP] Give pattern lock colors
Sanket Padawe [Thu, 4 Dec 2014 22:49:32 +0000 (14:49 -0800)]
Change default sim selection text in sim settings ui.
Bug:
18611090
Change-Id: Ifd2c26e02f1051536c4113b4351cefa51c2d5210
Maurice Lam [Thu, 4 Dec 2014 23:04:36 +0000 (23:04 +0000)]
Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 05:44:37 +0000 (21:44 -0800)]
[FRP] Give pattern lock colors
Bug:
18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493
PauloftheWest [Thu, 4 Dec 2014 20:32:40 +0000 (12:32 -0800)]
Removed the application SIM Cards from application list
Bug:
18623155
Change-Id: Ic9ef449136fb6ef854727ad994976a5dc6d8ee8c
Maurice Lam [Wed, 3 Dec 2014 23:17:46 +0000 (15:17 -0800)]
[FRP] Use setup wizard nav bar buttons
Use setup wizard nav bar buttons instead of custom button bar for
lock screen setup.
Bug:
18482708
Change-Id: I471f475ebe6bc7ba8cfbd179daddd854c1b6982a
Sanket Padawe [Thu, 4 Dec 2014 20:10:15 +0000 (12:10 -0800)]
Removing checks from EnableWifiTether which are done in SystemUI
Bug:
18368949
Change-Id: Ib80e7b4adaf4d5fb6029bbee0f6fdf5a99e18018
PauloftheWest [Thu, 4 Dec 2014 19:56:35 +0000 (11:56 -0800)]
SIM cards in Setting will only show on Multi-SIM devices
Bug:
16808006
Change-Id: Iecba1a1dabecf20ac8fa8c137f4eef4555ddceaf
PauloftheWest [Thu, 4 Dec 2014 18:30:26 +0000 (18:30 +0000)]
am
4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev
* commit '
4d7a6248587500f336834dce6e2f11fe078bf106':
Fixed a Settings crash when entering SIM status
PauloftheWest [Thu, 4 Dec 2014 18:25:33 +0000 (18:25 +0000)]
Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev
Sanket Padawe [Thu, 4 Dec 2014 18:19:11 +0000 (18:19 +0000)]
am
91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
* commit '
91a4deb5e9cc957918c2e27e509300f3015c72d6':
Removed unnecessary heading in Sim settings
Sanket Padawe [Thu, 4 Dec 2014 18:12:40 +0000 (18:12 +0000)]
Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
PauloftheWest [Thu, 4 Dec 2014 18:09:28 +0000 (10:09 -0800)]
Fixed a Settings crash when entering SIM status
Bug:
18596763
Change-Id: I699268345c342be05814bb531027dd53cba1c370
Geoff Mendal [Thu, 4 Dec 2014 15:17:53 +0000 (15:17 +0000)]
am
3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
3f5fd1febae34976bdc3f03b44eaec99bbf9703b':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 4 Dec 2014 15:17:52 +0000 (15:17 +0000)]
am
6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
* commit '
6ff07c418ff171296e763a6658fe4b7f49e12871':
Fix padding in user type selection dialog
Maurice Lam [Thu, 4 Dec 2014 15:17:51 +0000 (15:17 +0000)]
am
a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
* commit '
a3dff74e59b29fdff63810e55c27207a8354c935':
[FRP] Transitions for lock screen setup
Wink Saville [Thu, 4 Dec 2014 15:17:50 +0000 (15:17 +0000)]
am
98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
* commit '
98a35726522899efab19bafeff331b0f77553e89':
Change initMobileTabTag to use subInfoList
PauloftheWest [Thu, 4 Dec 2014 15:17:48 +0000 (15:17 +0000)]
am
e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '
e8a868f26616f59206eba19c0b08ad4c99882b8c':
Add SIM notification pop-ups.
Geoff Mendal [Thu, 4 Dec 2014 05:48:32 +0000 (05:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 05:46:50 +0000 (05:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 00:12:31 +0000 (16:12 -0800)]
[FRP] Add illustration to lock screen setup
Added the illustration JPG files, and added
SetupWizardUtils.setIllustration method that will change the
illustrations in the layout.
Bug:
18482708
Change-Id: I8c6758113f07cd33f85eaf6bc019e8194d9a17ce
Shishir Agrawal [Thu, 4 Dec 2014 01:36:28 +0000 (17:36 -0800)]
Settings app - read phone number from TelephonyManager.
The phone number needs to be always read from the TelephonyManager
since it can be overridden.
Bug:
18487514
Change-Id: If72094eb230c41b4f70146b0ccb012c9f9860626
Amith Yamasani [Thu, 4 Dec 2014 01:50:05 +0000 (01:50 +0000)]
Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 00:25:22 +0000 (00:25 +0000)]
Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
Maurice Lam [Wed, 3 Dec 2014 23:47:49 +0000 (15:47 -0800)]
[FRP] Transitions for lock screen setup
Use the slide transition for activities using the setup theme.
Bug:
18482708
Change-Id: I1a60a24f426118a63ec219bfbb378f255f362fa7
Wink Saville [Wed, 3 Dec 2014 23:33:00 +0000 (23:33 +0000)]
Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
PauloftheWest [Wed, 3 Dec 2014 23:30:52 +0000 (23:30 +0000)]
Merge "Add SIM notification pop-ups." into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 23:23:14 +0000 (15:23 -0800)]
Removed unnecessary heading in Sim settings
Bug:
17321738
Change-Id: If60d5539e67ca0f57b4d4fc62cb55118f8e0d3b2
Amith Yamasani [Wed, 3 Dec 2014 01:21:23 +0000 (17:21 -0800)]
Fix padding in user type selection dialog
Use preferred list item padding for the list items
and use the dialog context for creating the adapter.
Bug:
18509286
Change-Id: Ia5791a6283723a0ab458f24ec22b8890ab627657
Geoff Mendal [Wed, 3 Dec 2014 20:51:33 +0000 (12:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7a5232779f658029d1d30c4534e5e040d831b012
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Dec 2014 20:39:08 +0000 (12:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I09102039883ee5ee63f0f58f26ea2a2239b8d047
Auto-generated-cl: translation import
John Spurlock [Wed, 3 Dec 2014 20:37:50 +0000 (20:37 +0000)]
am
45893e65: Settings: Don\'t lose the switch bar returning to saver settings.
* commit '
45893e65b65a11abda22ea299f217d22c91228ca':
Settings: Don't lose the switch bar returning to saver settings.
John Spurlock [Wed, 3 Dec 2014 20:03:54 +0000 (15:03 -0500)]
Settings: Don't lose the switch bar returning to saver settings.
Bug:
18595359
Change-Id: I01c24fd8ed304837338c2b353805b3d3324e1639
PauloftheWest [Wed, 3 Dec 2014 18:16:52 +0000 (10:16 -0800)]
Fixed a SimSettings issue
+ SimSettings will not automatically select the first SIM for the user.
Bug:
18528013
Change-Id: I4c2024860231f6124a801feda821bc16bc2c4772
Alexandra Gherghina [Wed, 3 Dec 2014 17:27:10 +0000 (17:27 +0000)]
am
3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev
* commit '
3c00e18ba7425a1837a1e458f16e5192254a196b':
Modify account settings for better locale resolution
Zoltan Szatmary-Ban [Wed, 3 Dec 2014 17:27:09 +0000 (17:27 +0000)]
am
84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev
* commit '
84bc561848d55e320cbefd3acab8692e4f891a12':
Show account icons for managed profiles on Settings > Factory Reset
Alexandra Gherghina [Wed, 3 Dec 2014 12:15:37 +0000 (12:15 +0000)]
Merge "Modify account settings for better locale resolution" into lmp-mr1-dev
Alexandra Gherghina [Mon, 11 Aug 2014 11:40:13 +0000 (12:40 +0100)]
Modify account settings for better locale resolution
Bug:
16282173
Change-Id: I2ab861464cdbbb1c1b0a5a7231f960d8ed9e90c6