Commit Graph

7845 Commits

Author SHA1 Message Date
Sanket Padawe
fc988c03e1 Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev 2014-12-05 20:55:43 +00:00
Sanket Padawe
6d0059c3f9 Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 2014-12-05 20:55:29 +00:00
Maurice Lam
0973c31db1 [FRP] Use Lock type as header instead of "Encryption"
Bug: 18631620
Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1
2014-12-05 12:19:05 -08:00
Justin Harrison
0612a48563 Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev 2014-12-05 19:41:55 +00:00
Zoltan Szatmary-Ban
86c877e9b6 Make Location Settings multiprofile aware
Injected location services and location access status are shown
for managed profiles on Settings > Location

Bug: 18602878
Change-Id: Ic6232f3dc03d9675b90fbfd0163fe5bae4bd13c6
2014-12-05 19:40:59 +00:00
Fyodor Kupolov
d4057cc312 Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev 2014-12-05 19:28:43 +00:00
Shishir Agrawal
0b1f606c6e Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev 2014-12-05 19:25:59 +00:00
PauloftheWest
a754c6ba05 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
2014-12-05 19:21:45 +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
Adrian Roos
5df6e0302c Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 2014-12-05 18:25:59 +00:00
Jeff Davidson
5ead6b92fd Final platform settings UX for ephemeral networks.
Show "Connected via Wi-Fi assistant" instead of just "Connected" when
a Wi-Fi connection is ephemeral. Otherwise, treat ephemeral
connections just like saved ones - show (read-only) connection stats
when you click the network, and offer the ability to "forget" the
network, which prevents further ephemeral connections.

Bug: 18525241
Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
2014-12-05 10:14:41 -08:00
Adrian Roos
16809b1ad7 Fix race leading to spuriously disabled trust agents
If TrustManagerService is able to refresh the trust agents before
the Settings activity gets a chance to reenable the lock pattern,
the TrustManagerService won't see a secure credential and won't
load any agents. This was introduced when we switched to isSecure
instead of getKeyguardStoredPasswordQuality. The latter ignored
the lockPatternEnabled flag.

Bug: 18596036
Change-Id: I2734899f7684916fc84bc3a07edca29310887103
2014-12-05 18:47:20 +01:00
Sanket Padawe
9a73365ed7 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
2014-12-05 16:26:39 +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
2c0c983755 Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 2014-12-05 03:21: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
Amith Yamasani
0c8a2d63be 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
2014-12-05 00:14:14 +00:00
Wink Saville
05e3147192 am 527c7dbc: am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
* commit '527c7dbcc74a79b18c0c82a9778da49ba894e56d':
  Change initMobileTabTag to use subInfoList
2014-12-05 00:14:11 +00:00
PauloftheWest
2b2019255e am 753a00e0: am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
* commit '753a00e057201ad319bf85487beb1c6329bf1a05':
  Add SIM notification pop-ups.
2014-12-05 00:14:10 +00:00
Sanket Padawe
3c72c817f8 Change default sim selection text in sim settings ui.
Bug: 18611090
Change-Id: Ifd2c26e02f1051536c4113b4351cefa51c2d5210
2014-12-04 23:08: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
Maurice Lam
af103b4eb4 [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
2014-12-04 12:20:47 -08:00
Sanket Padawe
232b0e4e67 Removing checks from EnableWifiTether which are done in SystemUI
Bug: 18368949
Change-Id: Ib80e7b4adaf4d5fb6029bbee0f6fdf5a99e18018
2014-12-04 12:10:15 -08:00
PauloftheWest
dbd0382130 SIM cards in Setting will only show on Multi-SIM devices
Bug: 16808006
Change-Id: Iecba1a1dabecf20ac8fa8c137f4eef4555ddceaf
2014-12-04 11:56:35 -08: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
John Spurlock
39ccb47342 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.
2014-12-04 16:16:42 +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
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
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
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
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
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
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