OSDN Git Service
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
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: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 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
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.
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
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.
David 'Digit' Turner [Thu, 4 Dec 2014 09:13:40 +0000 (09:13 +0000)]
Merge "resolved conflicts for merge of
e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
David 'Digit' Turner [Thu, 4 Dec 2014 09:12:29 +0000 (10:12 +0100)]
resolved conflicts for merge of
e6af9327 to lmp-mr1-dev-plus-aosp
Change-Id: I53d46554c11b4d67b84cc713b88a09a28a79db4c
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
John Spurlock [Wed, 3 Dec 2014 20:53:57 +0000 (20:53 +0000)]
am
f29bc1df: am
45893e65: Settings: Don\'t lose the switch bar returning to saver settings.
* commit '
f29bc1df4e52090e2b55c63f63ef849722f267a4':
Settings: Don't lose the switch bar returning to saver settings.
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
Alexandra Gherghina [Wed, 3 Dec 2014 20:42:05 +0000 (20:42 +0000)]
am
7b7966e5: am
3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev
* commit '
7b7966e5a30aa30ad00d608cbc512b43dfebad4c':
Modify account settings for better locale resolution
Zoltan Szatmary-Ban [Wed, 3 Dec 2014 20:42:04 +0000 (20:42 +0000)]
am
9b1ac239: am
84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev
* commit '
9b1ac239cdad62de8dab458cec40eb752593dc9b':
Show account icons for managed profiles on Settings > Factory Reset
Sanket Padawe [Wed, 3 Dec 2014 20:40:06 +0000 (20:40 +0000)]
am
fc82a3de: am
ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
* commit '
fc82a3dea618a71d792a709d4f3580598aca2545':
Fixed improper capitalization related to trademark term in BT
Sanket Padawe [Wed, 3 Dec 2014 20:40:05 +0000 (20:40 +0000)]
am
5fe69a2c: am
97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev
* commit '
5fe69a2cfd9487d71b50aface7c6670f5ac64ace':
New activity for enabling tethering using Quick Settings
Sanket Padawe [Wed, 3 Dec 2014 20:40:04 +0000 (20:40 +0000)]
am
408f0a29: am
37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev
* commit '
408f0a29547a4e2d1ebfc828dea52133788f10a6':
Fixed crash in sim settings due to wrong toString() call.
Sanket Padawe [Wed, 3 Dec 2014 20:40:03 +0000 (20:40 +0000)]
am
9e878b1b: am
430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
* commit '
9e878b1b3a32388f82ba6c2c75343d8d04f6cb7c':
Fixing "SMS Messages" to "SMS messages" as per UX requirement.
Maurice Lam [Wed, 3 Dec 2014 20:40:02 +0000 (20:40 +0000)]
am
94c85309: am
7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '
94c85309b297e5c63d54b9a76f27e9119779411e':
[FRP] Theme interstitials for lock screen setup
Baligh Uddin [Wed, 3 Dec 2014 20:40:01 +0000 (20:40 +0000)]
am
47be93e9: (-s ours) am
18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
47be93e97a238cb02766517d554ea704e72731fc':
Import translations. DO NOT MERGE
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
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
David Turner [Wed, 3 Dec 2014 10:46:30 +0000 (10:46 +0000)]
Merge "Fix Settings app crash for devices with no USB support."
Zoltan Szatmary-Ban [Wed, 3 Dec 2014 10:23:27 +0000 (10:23 +0000)]
Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 02:29:06 +0000 (02:29 +0000)]
am
ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
* commit '
ef4d17910673709977624ff6d9e8ec499e3ac2fa':
Fixed improper capitalization related to trademark term in BT
Sanket Padawe [Wed, 3 Dec 2014 02:29:04 +0000 (02:29 +0000)]
am
97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev
* commit '
97c65a5ee6adbc7fa5b02e3a8bf31fbedb075326':
New activity for enabling tethering using Quick Settings
Sanket Padawe [Wed, 3 Dec 2014 02:29:03 +0000 (02:29 +0000)]
am
37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev
* commit '
37a0c07b9b73b8d99c43cfdce2bd0b78fdec2a2a':
Fixed crash in sim settings due to wrong toString() call.
Sanket Padawe [Wed, 3 Dec 2014 02:29:02 +0000 (02:29 +0000)]
am
430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
* commit '
430e01d01fb8ab51a4975d8f8d46760c7873f425':
Fixing "SMS Messages" to "SMS messages" as per UX requirement.
Maurice Lam [Wed, 3 Dec 2014 02:28:58 +0000 (02:28 +0000)]
am
7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '
7b484b9af07aa92c530312507ee9a8ea85b00198':
[FRP] Theme interstitials for lock screen setup
Baligh Uddin [Wed, 3 Dec 2014 02:28:57 +0000 (02:28 +0000)]
am
18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
187015873210af2923167d30f387e6d33fe01889':
Import translations. DO NOT MERGE
OSDN Git Service
