OSDN Git Service
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 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
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
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.
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:51:22 +0000 (05:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Thu, 4 Dec 2014 05:48:32 +0000 (05:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-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
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
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
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
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
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.
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.
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
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
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
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
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
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
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
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
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
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
Baligh Uddin [Wed, 3 Dec 2014 01:26:31 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Wink Saville [Wed, 3 Dec 2014 01:12:08 +0000 (17:12 -0800)]
Change initMobileTabTag to use subInfoList
Also add additional debug.
Bug:
18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
Baligh Uddin [Wed, 3 Dec 2014 01:01:39 +0000 (17:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: If02762d2b4f971f8ad83922eade1a2a8b85adca8
Auto-generated-cl: translation import
PauloftheWest [Tue, 18 Nov 2014 15:12:48 +0000 (07:12 -0800)]
Add SIM notification pop-ups.
+ Added a SimDialogActivity so any application can iniate a request to
se tthe default Data, Calls, and SMS.
Bug:
18293625
Change-Id: I60535125b40ece5ebc14542d732e4493bddefbae
Lucky Zhang [Wed, 3 Dec 2014 00:32:01 +0000 (00:32 +0000)]
am
23ab054d: am
955f412c: am
91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '
23ab054dd94a639ca43e011b931eb12c5122c596':
[FRP] Show FRP warning when disabling secure unlock
PauloftheWest [Wed, 3 Dec 2014 00:29:33 +0000 (00:29 +0000)]
am
50bbce77: am
cbf347c4: am
794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
* commit '
50bbce771324a264f720e402615fe6555b6c6e3b':
Changed SIM lock toggle to a switch
Lucky Zhang [Wed, 3 Dec 2014 00:01:31 +0000 (00:01 +0000)]
am
955f412c: am
91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '
955f412c4ba854c965f2aaf7ba96b4cda43b99b9':
[FRP] Show FRP warning when disabling secure unlock
Lucky Zhang [Tue, 2 Dec 2014 23:53:07 +0000 (23:53 +0000)]
am
91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '
91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19':
[FRP] Show FRP warning when disabling secure unlock
Lucky Zhang [Tue, 2 Dec 2014 23:45:55 +0000 (23:45 +0000)]
Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
Sanket Padawe [Tue, 2 Dec 2014 23:40:23 +0000 (15:40 -0800)]
Fixing "SMS Messages" to "SMS messages" as per UX requirement.
Bug:
17322866
Change-Id: Id4dcfc70ef4675adabeb42c3f6bdf5bdbe5f71f1
PauloftheWest [Tue, 2 Dec 2014 21:34:58 +0000 (21:34 +0000)]
am
cbf347c4: am
794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
* commit '
cbf347c42d06e27785ccde70763a2c4dbc45542d':
Changed SIM lock toggle to a switch
PauloftheWest [Tue, 2 Dec 2014 21:27:43 +0000 (21:27 +0000)]
am
794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
* commit '
794cbd70fa3d101b1a8a587faf327c7700c946eb':
Changed SIM lock toggle to a switch
PauloftheWest [Tue, 2 Dec 2014 21:19:51 +0000 (21:19 +0000)]
Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 20:22:55 +0000 (20:22 +0000)]
am
b07cd343: am
3fd2fa7b: am
003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
* commit '
b07cd343158e5726487f360c55bcbeb654263b99':
Bug Fix: SIM Status will display the proper network type
PauloftheWest [Tue, 2 Dec 2014 20:15:25 +0000 (20:15 +0000)]
am
3fd2fa7b: am
003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
* commit '
3fd2fa7b96a72f63afd9e4495fde4d31fa42edd5':
Bug Fix: SIM Status will display the proper network type
PauloftheWest [Tue, 2 Dec 2014 20:08:06 +0000 (20:08 +0000)]
am
003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
* commit '
003aee5f0adfde950407380a5c738ed4bc59bf2b':
Bug Fix: SIM Status will display the proper network type
PauloftheWest [Tue, 2 Dec 2014 20:01:39 +0000 (20:01 +0000)]
Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
PauloftheWest [Tue, 25 Nov 2014 20:15:35 +0000 (12:15 -0800)]
Bug Fix: SIM Status will display the proper network type
Bug:
18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:40:21 +0000 (19:40 +0000)]
am
eeaf8608: am
04f2391d: am
61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
* commit '
eeaf8608d3892337cd47635e4b6ba80c7ca7852b':
[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:31:26 +0000 (19:31 +0000)]
am
04f2391d: am
61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
* commit '
04f2391d17ce994b6d1da5907c7b5010621091b2':
[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:18:50 +0000 (19:18 +0000)]
am
61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
* commit '
61066c13ed5ba493c58c76d84f489a35dc5af8d1':
[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:09:00 +0000 (19:09 +0000)]
Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
Sanket Padawe [Tue, 2 Dec 2014 18:52:22 +0000 (10:52 -0800)]
Fixed crash in sim settings due to wrong toString() call.
Bug:
18589605
Change-Id: I2ae756f113904e1325ad3cc686cee0300cbd71e4
PauloftheWest [Tue, 2 Dec 2014 18:19:48 +0000 (18:19 +0000)]
am
96ba998a: am
99348d69: am
da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
* commit '
96ba998a0b8d03cab6fa8558a0bfe3487de97158':
Added color to Data Usage graph
PauloftheWest [Tue, 2 Dec 2014 18:19:47 +0000 (18:19 +0000)]
am
c33b2ee3: am
f28bd654: am
fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
* commit '
c33b2ee31acffd9a729351452f5f0d3bbec87dba':
Fixed a Wi-Fi dialog crash
PauloftheWest [Tue, 2 Dec 2014 18:12:22 +0000 (18:12 +0000)]
am
99348d69: am
da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
* commit '
99348d6911ec15d9a93a2ce72b9c276929789499':
Added color to Data Usage graph
PauloftheWest [Tue, 2 Dec 2014 18:12:21 +0000 (18:12 +0000)]
am
f28bd654: am
fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
* commit '
f28bd654620102de2408383b9bba5114a9556267':
Fixed a Wi-Fi dialog crash
PauloftheWest [Tue, 2 Dec 2014 18:12:01 +0000 (18:12 +0000)]
am
506607d1: am
21316f1d: am
41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
* commit '
506607d1f8c9b05b230e3031e41c2d97f1c78e28':
Remove extraneous SIM status information
PauloftheWest [Tue, 2 Dec 2014 18:04:43 +0000 (18:04 +0000)]
am
da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
* commit '
da02111f16b7d2b09fb447342a9aa4640c75a117':
Added color to Data Usage graph
PauloftheWest [Tue, 2 Dec 2014 18:04:42 +0000 (18:04 +0000)]
am
fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
* commit '
fc6a8bf2d729ad21fa8d7622f580401db351c269':
Fixed a Wi-Fi dialog crash
PauloftheWest [Tue, 2 Dec 2014 18:04:15 +0000 (18:04 +0000)]
am
21316f1d: am
41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
* commit '
21316f1d1aedaffbd9f882f4cecdf518e8521212':
Remove extraneous SIM status information
PauloftheWest [Tue, 2 Dec 2014 17:58:46 +0000 (17:58 +0000)]
Merge "Added color to Data Usage graph" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:58:23 +0000 (17:58 +0000)]
Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:56:08 +0000 (17:56 +0000)]
am
41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
* commit '
41c2962552b750a8e5fa07f283ba2b72b36d2298':
Remove extraneous SIM status information
PauloftheWest [Tue, 2 Dec 2014 17:50:30 +0000 (17:50 +0000)]
Merge "Remove extraneous SIM status information" into lmp-mr1-dev
Sanket Padawe [Tue, 2 Dec 2014 17:45:35 +0000 (09:45 -0800)]
New activity for enabling tethering using Quick Settings
Added a new activity which would handle tethering on clicking Tethering
tile of Quick Settings.
Bug:
18368949
Change-Id: I77057f3ccd26263831ba88e426b5f8d3ad1fa788
Zoltan Szatmary-Ban [Tue, 2 Dec 2014 17:22:10 +0000 (17:22 +0000)]
Show account icons for managed profiles on Settings > Factory Reset
Fixing a bug where managed profile's accounts where shown without
the account icon.
Bug:
18555032
Change-Id: I5a1094e795b31a00599bc4df413573030693b436
Yu Ning [Tue, 2 Dec 2014 09:52:42 +0000 (17:52 +0800)]
Fix Settings app crash for devices with no USB support.
On emulator and any device that does not support USB connection, the
Settings app crashes as soon as the user tries to view the details of
an installed app. This is because the InstalledAppDetails activity
assumes that the USB service is always started, which is no longer
true due to a change in SystemServer.java (frameworks/base, Change-Id
I6dad511c652bcacc085f27ede5f8f22a6982c6bd). Adding null checks fixes
this issue.
Change-Id: I85263fb795ee06bd61ba28ec12a7161c1f17f4cc
Signed-off-by: Yu Ning <yu.ning@intel.com>
Maurice Lam [Tue, 2 Dec 2014 06:46:56 +0000 (06:46 +0000)]
am
62009bf8: am
a2caf633: am
1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
* commit '
62009bf8564accddf97ef3dbf6c90ae9286ea07c':
[WifiSetup] Swap buttons position in Skip dialog
Maurice Lam [Mon, 1 Dec 2014 18:41:49 +0000 (10:41 -0800)]
[FRP] Theme interstitials for lock screen setup
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.
Bug:
18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
Maurice Lam [Tue, 2 Dec 2014 03:12:18 +0000 (03:12 +0000)]
am
a2caf633: am
1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
* commit '
a2caf6332f2b55e1480724d025ffb7592dcd13f7':
[WifiSetup] Swap buttons position in Skip dialog
OSDN Git Service
