OSDN Git Service
Lucky Zhang [Tue, 9 Dec 2014 23:15:37 +0000 (23:15 +0000)]
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
Lucky Zhang [Tue, 9 Dec 2014 23:15:29 +0000 (23:15 +0000)]
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
Maurice Lam [Tue, 9 Dec 2014 23:15:21 +0000 (23:15 +0000)]
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
Jeff Davidson [Tue, 9 Dec 2014 23:11:44 +0000 (15:11 -0800)]
resolve merge conflicts of
0c7e4ed to master.
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
Maurice Lam [Tue, 9 Dec 2014 00:55:49 +0000 (00:55 +0000)]
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"
Sanket Padawe [Tue, 9 Dec 2014 00:55:48 +0000 (00:55 +0000)]
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
Sanket Padawe [Tue, 9 Dec 2014 00:55:47 +0000 (00:55 +0000)]
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.
Justin Harrison [Tue, 9 Dec 2014 00:55:45 +0000 (00:55 +0000)]
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
Fyodor Kupolov [Tue, 9 Dec 2014 00:55:44 +0000 (00:55 +0000)]
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
Shishir Agrawal [Tue, 9 Dec 2014 00:55:43 +0000 (00:55 +0000)]
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.
Adrian Roos [Tue, 9 Dec 2014 00:55:41 +0000 (00:55 +0000)]
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
Maurice Lam [Tue, 9 Dec 2014 00:55:40 +0000 (00:55 +0000)]
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
Justin Harrison [Tue, 9 Dec 2014 00:55:39 +0000 (00:55 +0000)]
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
Maurice Lam [Tue, 9 Dec 2014 00:55:37 +0000 (00:55 +0000)]
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
Maurice Lam [Tue, 9 Dec 2014 00:55:36 +0000 (00:55 +0000)]
am
5d7cef31: am
b6f5e003: am
13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
* commit '
5d7cef31bc9aede1ebe2ce64906b2a7766d94c99':
[FRP] Give pattern lock colors
Lucky Zhang [Mon, 8 Dec 2014 19:41:45 +0000 (19:41 +0000)]
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
Lucky Zhang [Mon, 8 Dec 2014 19:41:44 +0000 (19:41 +0000)]
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
Maurice Lam [Mon, 8 Dec 2014 19:37:12 +0000 (19:37 +0000)]
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
Jeff Davidson [Mon, 8 Dec 2014 19:36:47 +0000 (19:36 +0000)]
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.
Maurice Lam [Mon, 8 Dec 2014 19:18:16 +0000 (19:18 +0000)]
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"
Sanket Padawe [Mon, 8 Dec 2014 19:17:50 +0000 (19:17 +0000)]
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
Sanket Padawe [Mon, 8 Dec 2014 19:17:49 +0000 (19:17 +0000)]
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.
Justin Harrison [Mon, 8 Dec 2014 19:16:45 +0000 (19:16 +0000)]
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
Fyodor Kupolov [Mon, 8 Dec 2014 19:16:06 +0000 (19:16 +0000)]
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
Shishir Agrawal [Mon, 8 Dec 2014 19:16:05 +0000 (19:16 +0000)]
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.
Adrian Roos [Mon, 8 Dec 2014 19:15:30 +0000 (19:15 +0000)]
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
Maurice Lam [Mon, 8 Dec 2014 19:14:06 +0000 (19:14 +0000)]
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
Justin Harrison [Mon, 8 Dec 2014 19:13:27 +0000 (19:13 +0000)]
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
Maurice Lam [Mon, 8 Dec 2014 19:12:12 +0000 (19:12 +0000)]
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
Maurice Lam [Mon, 8 Dec 2014 19:10:20 +0000 (19:10 +0000)]
am
b6f5e003: am
13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
* commit '
b6f5e003a9167c44155906235762f2fac890c66a':
[FRP] Give pattern lock colors
Geoff Mendal [Mon, 8 Dec 2014 14:51:46 +0000 (06:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ide3e406681ef2f9a6198de5436f4cd1df3888282
Auto-generated-cl: translation import
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
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
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
PauloftheWest [Fri, 5 Dec 2014 19:21:45 +0000 (19:21 +0000)]
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
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
PauloftheWest [Fri, 5 Dec 2014 19:12:44 +0000 (19:12 +0000)]
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
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
Sanket Padawe [Fri, 5 Dec 2014 16:26:39 +0000 (16:26 +0000)]
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
Sanket Padawe [Fri, 5 Dec 2014 15:52:03 +0000 (15:52 +0000)]
am
669d4e4f: am
91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
* commit '
669d4e4fce68d3f8e6391fab5d4e60e358234767':
Removed unnecessary heading in Sim settings
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
Geoff Mendal [Fri, 5 Dec 2014 00:14:20 +0000 (00:14 +0000)]
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
Amith Yamasani [Fri, 5 Dec 2014 00:14:14 +0000 (00:14 +0000)]
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
Maurice Lam [Fri, 5 Dec 2014 00:14:13 +0000 (00:14 +0000)]
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
Wink Saville [Fri, 5 Dec 2014 00:14:11 +0000 (00:14 +0000)]
am
527c7dbc: am
0d8027ce: am
98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
* commit '
527c7dbcc74a79b18c0c82a9778da49ba894e56d':
Change initMobileTabTag to use subInfoList
PauloftheWest [Fri, 5 Dec 2014 00:14:10 +0000 (00:14 +0000)]
am
753a00e0: am
06ddf97c: am
e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '
753a00e057201ad319bf85487beb1c6329bf1a05':
Add SIM notification pop-ups.
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
Geoff Mendal [Thu, 4 Dec 2014 21:47:16 +0000 (21:47 +0000)]
am
e2182449: (-s ours) am
3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
e21824491ee47ecc35376b9fd909a07416276f29':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 4 Dec 2014 21:47:15 +0000 (21:47 +0000)]
am
53e8940b: am
6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
* commit '
53e8940b94a7b508659b84fd9037f922f1d4a50f':
Fix padding in user type selection dialog
Maurice Lam [Thu, 4 Dec 2014 21:47:14 +0000 (21:47 +0000)]
am
45f44ad7: am
a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
* commit '
45f44ad7e31b3ef8f4e3f4b5bd43cc215e712b9f':
[FRP] Transitions for lock screen setup
Wink Saville [Thu, 4 Dec 2014 21:47:13 +0000 (21:47 +0000)]
am
0d8027ce: am
98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
* commit '
0d8027cedcea809d925af5a19590388e8b4945d0':
Change initMobileTabTag to use subInfoList
PauloftheWest [Thu, 4 Dec 2014 21:47:11 +0000 (21:47 +0000)]
am
06ddf97c: am
e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '
06ddf97c4da204e62a5427c8e22643c267c1d9ed':
Add SIM notification pop-ups.
Geoff Mendal [Thu, 4 Dec 2014 20:46:08 +0000 (20:46 +0000)]
am
b8fcb473: (-s ours) am
a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
b8fcb473e499ed160ee24cccdba73002a73977e3':
Import translations. DO NOT MERGE
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
Geoff Mendal [Thu, 4 Dec 2014 20:24:52 +0000 (20:24 +0000)]
am
a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
a37526a6829c24abfac6fc21b41225f7ee11e756':
Import translations. DO NOT MERGE
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 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
David 'Digit' Turner [Thu, 4 Dec 2014 16:17:39 +0000 (16:17 +0000)]
am
5e883b3b: Merge "resolved conflicts for merge of
e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
* commit '
5e883b3b37e7203f712174ed46b7a04eb19ea3da':
Fix Settings app crash for devices with no USB support.
John Spurlock [Thu, 4 Dec 2014 16:16:42 +0000 (16:16 +0000)]
am
24f17f0b: am
f29bc1df: am
45893e65: Settings: Don\'t lose the switch bar returning to saver settings.
* commit '
24f17f0b94341c84ca017598089bdb52e44e1f6a':
Settings: Don't lose the switch bar returning to saver settings.
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.