Commit Graph

7304 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
f84c6ee01c Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 2014-12-08 12:50:11 +00:00
Lucky Zhang
73ae2d3adc Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev 2014-12-08 09:31:46 +00:00
Lucky Zhang
df8566a9a1 [FRP] Remove None and Swipe from screen lock options
Removed "None" and "Swipe" from screen lock options in the choosing
lock screen during setup wizard, because at this step, the user has
already chosen to pick a screen lock, hence it's unnecessory to show
"none" and "swipe".

Implemented this by overriding the DisableUnusablePreferences in
SetupChooseLockGenericFragment to disable the insecure lock methods
and adding a flag to hide disabled methods for setup wizard.

Bug: 18631416
Change-Id: I3feccf591da25bd6eadcc03c75b28cfc1d069db7
2014-12-05 18:50:55 -08:00
Jeff Davidson
9dc247bba2 Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev 2014-12-06 02:07:31 +00:00
Maurice Lam
7dca460af7 Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev 2014-12-05 21:57:00 +00:00
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
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
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
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
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
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
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
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
Fyodor Kupolov
cfae855d67 Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
Added BroadcastReceiver for ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED to
refresh the list, if event has been received. It could be that checkboxes
need to be updated. Also disable the checkbox while admin is being removed.

Bug: 17609838
Change-Id: Id1f72c27111c280a77a03ba6ba26bcdbbb10bb58
2014-12-02 17:24:13 -08: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
91177d1c16 Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev 2014-12-02 23:45:56 +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
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
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
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