git.osdn.net Git - android-x86/packages-apps-Settings.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Thu, 4 Dec 2014 23:04:36 +0000 (23:04 +0000)]

Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev

commit | commitdiff | tree

Maurice Lam [Thu, 4 Dec 2014 05:44:37 +0000 (21:44 -0800)]

[FRP] Give pattern lock colors

Bug: 18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sanket Padawe [Thu, 4 Dec 2014 18:12:40 +0000 (18:12 +0000)]

Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 05:51:22 +0000 (05:51 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 05:48:32 +0000 (05:48 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 05:46:50 +0000 (05:46 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Thu, 4 Dec 2014 00:25:22 +0000 (00:25 +0000)]

Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Wink Saville [Wed, 3 Dec 2014 23:33:00 +0000 (23:33 +0000)]

Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Wed, 3 Dec 2014 23:30:52 +0000 (23:30 +0000)]

Merge "Add SIM notification pop-ups." into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 23:23:14 +0000 (15:23 -0800)]

Removed unnecessary heading in Sim settings

Bug: 17321738
Change-Id: If60d5539e67ca0f57b4d4fc62cb55118f8e0d3b2

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexandra Gherghina [Wed, 3 Dec 2014 21:52:32 +0000 (21:52 +0000)]

am 9d4d02b2: am 7b7966e5: am 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev

* commit '9d4d02b254fc46881f69ce46c80c9824100c123e':
Modify account settings for better locale resolution

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 3 Dec 2014 21:52:30 +0000 (21:52 +0000)]

am 0b83adac: am 9b1ac239: am 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev

* commit '0b83adacfc8ea9da75b081220245a15c005b9aa9':
Show account icons for managed profiles on Settings > Factory Reset

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 21:52:29 +0000 (21:52 +0000)]

am 09d2676c: am fc82a3de: am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev

* commit '09d2676cab013c4b7e4352c8d956ebf0436ad631':
Fixed improper capitalization related to trademark term in BT

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 21:52:28 +0000 (21:52 +0000)]

am 3bae7245: am 5fe69a2c: am 97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev

* commit '3bae72459f352b60893955a5b3c23614ca9c8403':
New activity for enabling tethering using Quick Settings

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 21:52:26 +0000 (21:52 +0000)]

am b58859a7: am 408f0a29: am 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev

* commit 'b58859a72345c13f332f2bf6ace3fb52f02bf258':
Fixed crash in sim settings due to wrong toString() call.

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 21:52:25 +0000 (21:52 +0000)]

am 4633e152: am 9e878b1b: am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev

* commit '4633e152c80ac60f83e2e0d0db3e3b93d6928c66':
Fixing "SMS Messages" to "SMS messages" as per UX requirement.

commit | commitdiff | tree

Maurice Lam [Wed, 3 Dec 2014 21:52:23 +0000 (21:52 +0000)]

am 2ecc0107: am 94c85309: am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev

* commit '2ecc0107dcc939bd4e3b9f4c4359f9845cae1b82':
[FRP] Theme interstitials for lock screen setup

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 21:52:22 +0000 (21:52 +0000)]

am 38fa4d01: (-s ours) am 47be93e9: (-s ours) am 18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '38fa4d01c5ce9981026386d7328aab0c32fe7eb8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Dec 2014 21:01:49 +0000 (13:01 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ic22c5b6d3187254593d57008979abaad26fd5c3d
Auto-generated-cl: translation import

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

David Turner [Wed, 3 Dec 2014 10:46:30 +0000 (10:46 +0000)]

Merge "Fix Settings app crash for devices with no USB support."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 01:36:09 +0000 (01:36 +0000)]

Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 01:33:58 +0000 (01:33 +0000)]

Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 01:32:26 +0000 (01:32 +0000)]

Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Wed, 3 Dec 2014 01:31:43 +0000 (01:31 +0000)]

Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev

commit | commitdiff | tree

Maurice Lam [Wed, 3 Dec 2014 01:27:55 +0000 (01:27 +0000)]

Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev