Maurice Lam
40a252ce49
am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
...
* commit 'dfaf4c92c19356116267cf9c61168414d817b9a7':
[FRP] Add illustration to lock screen setup
2014-12-05 00:32:53 +00:00
Maurice Lam
dfaf4c92c1
Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
2014-12-05 00:23:00 +00:00
Maurice Lam
b6f5e003a9
am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
...
* commit '13989d6d9f25a5d09d68dfc98b31595e8e6b8425':
[FRP] Give pattern lock colors
2014-12-04 23:13:50 +00:00
Maurice Lam
13989d6d9f
Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
2014-12-04 23:04:37 +00:00
Maurice Lam
67f105bc98
[FRP] Give pattern lock colors
...
Bug: 18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493
2014-12-04 14:30:52 -08:00
PauloftheWest
651474d027
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
2014-12-04 18:30:26 +00:00
PauloftheWest
4d7a624858
Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev
2014-12-04 18:25:34 +00:00
Sanket Padawe
669d4e4fce
am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
...
* commit '91a4deb5e9cc957918c2e27e509300f3015c72d6':
Removed unnecessary heading in Sim settings
2014-12-04 18:19:11 +00:00
Sanket Padawe
91a4deb5e9
Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
2014-12-04 18:12:41 +00:00
PauloftheWest
7fa2415492
Fixed a Settings crash when entering SIM status
...
Bug: 18596763
Change-Id: I699268345c342be05814bb531027dd53cba1c370
2014-12-04 10:09:28 -08:00
Geoff Mendal
e21824491e
am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '3f5fd1febae34976bdc3f03b44eaec99bbf9703b':
Import translations. DO NOT MERGE
2014-12-04 15:17:53 +00:00
Amith Yamasani
53e8940b94
am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
...
* commit '6ff07c418ff171296e763a6658fe4b7f49e12871':
Fix padding in user type selection dialog
2014-12-04 15:17:52 +00:00
Maurice Lam
45f44ad7e3
am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
...
* commit 'a3dff74e59b29fdff63810e55c27207a8354c935':
[FRP] Transitions for lock screen setup
2014-12-04 15:17:51 +00:00
Wink Saville
0d8027cedc
am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
...
* commit '98a35726522899efab19bafeff331b0f77553e89':
Change initMobileTabTag to use subInfoList
2014-12-04 15:17:50 +00:00
PauloftheWest
06ddf97c4d
am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
...
* commit 'e8a868f26616f59206eba19c0b08ad4c99882b8c':
Add SIM notification pop-ups.
2014-12-04 15:17:48 +00:00
Geoff Mendal
a37526a682
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-12-04 05:48:32 +00:00
Geoff Mendal
3f5fd1feba
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-04 05:46:51 +00:00
Maurice Lam
1227a19ecc
[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
2014-12-03 21:19:21 -08:00
Amith Yamasani
6ff07c418f
Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
2014-12-04 01:50:05 +00:00
Maurice Lam
a3dff74e59
Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
2014-12-04 00:25:23 +00:00
Maurice Lam
784f02720e
[FRP] Transitions for lock screen setup
...
Use the slide transition for activities using the setup theme.
Bug: 18482708
Change-Id: I1a60a24f426118a63ec219bfbb378f255f362fa7
2014-12-03 16:18:13 -08:00
Wink Saville
98a3572652
Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
2014-12-03 23:33:01 +00:00
PauloftheWest
e8a868f266
Merge "Add SIM notification pop-ups." into lmp-mr1-dev
2014-12-03 23:30:53 +00:00
Sanket Padawe
3b72ead136
Removed unnecessary heading in Sim settings
...
Bug: 17321738
Change-Id: If60d5539e67ca0f57b4d4fc62cb55118f8e0d3b2
2014-12-03 15:23:14 -08:00
Amith Yamasani
f3db021ba5
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
2014-12-03 14:20:05 -08:00
Geoff Mendal
4a66e6d4c4
Import translations. DO NOT MERGE
...
Change-Id: I7a5232779f658029d1d30c4534e5e040d831b012
Auto-generated-cl: translation import
2014-12-03 12:51:33 -08:00
Geoff Mendal
dfa34df936
Import translations. DO NOT MERGE
...
Change-Id: I09102039883ee5ee63f0f58f26ea2a2239b8d047
Auto-generated-cl: translation import
2014-12-03 12:39:08 -08:00
John Spurlock
f29bc1df4e
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.
2014-12-03 20:37:50 +00:00
John Spurlock
45893e65b6
Settings: Don't lose the switch bar returning to saver settings.
...
Bug: 18595359
Change-Id: I01c24fd8ed304837338c2b353805b3d3324e1639
2014-12-03 15:06:06 -05:00
Alexandra Gherghina
7b7966e5a3
am 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev
...
* commit '3c00e18ba7425a1837a1e458f16e5192254a196b':
Modify account settings for better locale resolution
2014-12-03 17:27:10 +00:00
Zoltan Szatmary-Ban
9b1ac239cd
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
2014-12-03 17:27:09 +00:00
Alexandra Gherghina
3c00e18ba7
Merge "Modify account settings for better locale resolution" into lmp-mr1-dev
2014-12-03 12:15:39 +00:00
Alexandra Gherghina
62464b819e
Modify account settings for better locale resolution
...
Bug: 16282173
Change-Id: I2ab861464cdbbb1c1b0a5a7231f960d8ed9e90c6
2014-12-03 10:50:54 +00:00
Zoltan Szatmary-Ban
84bc561848
Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev
2014-12-03 10:23:28 +00:00
Sanket Padawe
fc82a3dea6
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
2014-12-03 02:29:06 +00:00
Sanket Padawe
5fe69a2cfd
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
2014-12-03 02:29:04 +00:00
Sanket Padawe
408f0a2954
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.
2014-12-03 02:29:03 +00:00
Sanket Padawe
9e878b1b3a
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.
2014-12-03 02:29:02 +00:00
Maurice Lam
94c85309b2
am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
...
* commit '7b484b9af07aa92c530312507ee9a8ea85b00198':
[FRP] Theme interstitials for lock screen setup
2014-12-03 02:28:58 +00:00
Baligh Uddin
47be93e97a
am 18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '187015873210af2923167d30f387e6d33fe01889':
Import translations. DO NOT MERGE
2014-12-03 02:28:57 +00:00
Sanket Padawe
ef4d179106
Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
2014-12-03 01:36:10 +00:00
Sanket Padawe
97c65a5ee6
Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev
2014-12-03 01:34:00 +00:00
Sanket Padawe
37a0c07b9b
Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev
2014-12-03 01:32:26 +00:00
Sanket Padawe
430e01d01f
Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
2014-12-03 01:31:43 +00:00
Maurice Lam
7b484b9af0
Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
2014-12-03 01:27:57 +00:00
Baligh Uddin
1870158732
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-03 01:26:37 +00:00
Wink Saville
fcec91f475
Change initMobileTabTag to use subInfoList
...
Also add additional debug.
Bug: 18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
2014-12-02 17:12:08 -08:00
Baligh Uddin
ebb64630ae
Import translations. DO NOT MERGE
...
Change-Id: If02762d2b4f971f8ad83922eade1a2a8b85adca8
Auto-generated-cl: translation import
2014-12-02 17:01:39 -08:00
PauloftheWest
ffef98b3a0
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
2014-12-02 16:35:32 -08:00
Lucky Zhang
955f412c4b
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
2014-12-02 23:53:07 +00:00