Commit Graph

7317 Commits

Author SHA1 Message Date
Maurice Lam
3d9267f307 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
2014-12-08 19:12:12 +00:00
PauloftheWest
d831733fab 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
2014-12-05 19:12:44 +00:00
Sanket Padawe
76fd9d62fa am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
* commit '669d4e4fce68d3f8e6391fab5d4e60e358234767':
  Removed unnecessary heading in Sim settings
2014-12-05 15:52:03 +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
Amith Yamasani
a7ddb536fd 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
2014-12-04 21:47:15 +00:00
Wink Saville
527c7dbcc7 am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
* commit '0d8027cedcea809d925af5a19590388e8b4945d0':
  Change initMobileTabTag to use subInfoList
2014-12-04 21:47:13 +00:00
PauloftheWest
753a00e057 am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '06ddf97c4da204e62a5427c8e22643c267c1d9ed':
  Add SIM notification pop-ups.
2014-12-04 21:47:11 +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
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
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
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
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
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
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
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
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
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
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
Maurice Lam
7b484b9af0 Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 2014-12-03 01:27:57 +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
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
23ab054dd9 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
2014-12-03 00:01:31 +00:00
Lucky Zhang
91177d1c16 Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev 2014-12-02 23:45:56 +00:00
PauloftheWest
50bbce7713 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
2014-12-02 21:34:58 +00:00
PauloftheWest
794cbd70fa Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev 2014-12-02 21:19:52 +00:00
PauloftheWest
b07cd34315 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
2014-12-02 20:15:25 +00:00
PauloftheWest
003aee5f0a Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev 2014-12-02 20:01:40 +00:00
PauloftheWest
6fc9207ebe Bug Fix: SIM Status will display the proper network type
Bug: 18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27
2014-12-02 11:59:17 -08:00
Simranjit Singh Kohli
eeaf8608d3 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
2014-12-02 19:31:26 +00:00
Simranjit Singh Kohli
61066c13ed Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev 2014-12-02 19:09:01 +00:00
Sanket Padawe
e06387ff5b Fixed crash in sim settings due to wrong toString() call.
Bug: 18589605
Change-Id: I2ae756f113904e1325ad3cc686cee0300cbd71e4
2014-12-02 18:54:11 +00:00
PauloftheWest
96ba998a0b am 99348d69: am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
* commit '99348d6911ec15d9a93a2ce72b9c276929789499':
  Added color to Data Usage graph
2014-12-02 18:12:22 +00:00
PauloftheWest
c33b2ee31a am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
* commit 'f28bd654620102de2408383b9bba5114a9556267':
  Fixed a Wi-Fi dialog crash
2014-12-02 18:12:21 +00:00
PauloftheWest
da02111f16 Merge "Added color to Data Usage graph" into lmp-mr1-dev 2014-12-02 17:58:47 +00:00
PauloftheWest
fc6a8bf2d7 Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 2014-12-02 17:58:24 +00:00
Sanket Padawe
bcbe980986 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
2014-12-02 09:45:35 -08:00
Zoltan Szatmary-Ban
546790c1ed 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
2014-12-02 17:22:10 +00:00
Maurice Lam
ecd2b7b81f [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
2014-12-01 20:24:08 -08:00
Maurice Lam
62009bf856 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
2014-12-02 03:12:18 +00:00
Maurice Lam
1dce16a61c Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 2014-12-02 02:59:10 +00:00