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
Shishir Agrawal
dd4443a236
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
2014-12-03 19:12:50 -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
Alexandra Gherghina
5d66a9d6a0
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
2014-12-03 21:52:32 +00:00
Zoltan Szatmary-Ban
bedf4a279e
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
2014-12-03 21:52:30 +00:00
Sanket Padawe
c88fab28b2
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
2014-12-03 21:52:29 +00:00
Sanket Padawe
3bbfa7b355
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
2014-12-03 21:52:28 +00:00
Sanket Padawe
a19309eaf8
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.
2014-12-03 21:52:26 +00:00
Sanket Padawe
717c872ad3
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.
2014-12-03 21:52:25 +00:00
Maurice Lam
ec957dfcf7
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
2014-12-03 21:52:23 +00:00
Baligh Uddin
e124d394d1
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
2014-12-03 21:52:22 +00:00
Geoff Mendal
4c40383885
Import translations. DO NOT MERGE
...
Change-Id: Ic22c5b6d3187254593d57008979abaad26fd5c3d
Auto-generated-cl: translation import
2014-12-03 13:01:49 -08:00
John Spurlock
24f17f0b94
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.
2014-12-03 20:53:57 +00: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
Alexandra Gherghina
9d4d02b254
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
2014-12-03 20:42:05 +00:00
Zoltan Szatmary-Ban
0b83adacfc
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
2014-12-03 20:42:04 +00:00
Sanket Padawe
09d2676cab
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
2014-12-03 20:40:06 +00:00
Sanket Padawe
3bae72459f
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
2014-12-03 20:40:05 +00:00
Sanket Padawe
b58859a723
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.
2014-12-03 20:40:04 +00:00
Sanket Padawe
4633e152c8
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.
2014-12-03 20:40:03 +00:00
Maurice Lam
2ecc0107dc
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
2014-12-03 20:40:02 +00:00
Baligh Uddin
38fa4d01c5
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
2014-12-03 20:40:01 +00: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
PauloftheWest
e51465254d
Fixed a SimSettings issue
...
+ SimSettings will not automatically select the first SIM for the user.
Bug: 18528013
Change-Id: I4c2024860231f6124a801feda821bc16bc2c4772
2014-12-03 10:16:52 -08: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
David Turner
e6af93277c
Merge "Fix Settings app crash for devices with no USB support."
2014-12-03 10:46:31 +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