Commit Graph

25070 Commits

Author SHA1 Message Date
Noah Wang
ce7e9eb5e6 Merge "Reflect settings change right after interaction" 2016-01-27 18:49:02 +00:00
Udam Saini
aa693f6734 Merge "Adds screen lock as a suggested activity" 2016-01-27 18:08:48 +00:00
Tony Mak
78d1ca1c2a Merge "Default apps setting for managed profile" 2016-01-27 17:17:44 +00:00
Oleksandr Peletskyi
8b53b1e9bf Gray out Wallpapers menu item when setting of wallpapers is not allowed.
BUG: 24890474

Change-Id: Ia6bfcd1c8fefeff46f30c4e9a60aa2a52c39fa27
2016-01-27 18:07:18 +01:00
Jason Monk
5f75f5ef71 Fix multi-sim cell data pref ?
Bug: 26795856
Change-Id: I82e18c21d819d51712a65ccc37e4e3af9a006771
2016-01-27 11:42:24 -05:00
Geoff Mendal
c7947b7e97 Import translations. DO NOT MERGE am: 963c4b3d41 -s ours am: 495ba780b9 -s ours
am: a43de57411  -s ours

* commit 'a43de574118046520a71afc4ad14c524611ec4c0':
  Import translations. DO NOT MERGE
2016-01-27 16:26:06 +00:00
Geoff Mendal
450b10b3c2 Import translations. DO NOT MERGE am: 9c57679b0e -s ours
am: ec30b691de  -s ours

* commit 'ec30b691de360ebc0030e799dd5f42ed90720ada':
  Import translations. DO NOT MERGE
2016-01-27 16:25:57 +00:00
Geoff Mendal
a43de57411 Import translations. DO NOT MERGE am: 963c4b3d41 -s ours
am: 495ba780b9  -s ours

* commit '495ba780b98bc1333e613d96721355aa1003913b':
  Import translations. DO NOT MERGE
2016-01-27 16:24:10 +00:00
Geoff Mendal
ec30b691de Import translations. DO NOT MERGE
am: 9c57679b0e  -s ours

* commit '9c57679b0e06d9976bb4c72d442b3412d9220c43':
  Import translations. DO NOT MERGE
2016-01-27 16:24:00 +00:00
Geoff Mendal
495ba780b9 Import translations. DO NOT MERGE
am: 963c4b3d41  -s ours

* commit '963c4b3d41c872404e84d469b213cd5a84d6d3ec':
  Import translations. DO NOT MERGE
2016-01-27 16:22:12 +00:00
Chris Wren
9d1bfd1e8d port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
2016-01-27 10:58:58 -05:00
Geoff Mendal
9c57679b0e Import translations. DO NOT MERGE
Change-Id: I528d633660acacb4ed8a3f1d6bf2b35b3ce3170d
Auto-generated-cl: translation import
2016-01-27 07:34:25 -08:00
Geoff Mendal
963c4b3d41 Import translations. DO NOT MERGE
Change-Id: I11b283943bfe2746792e6a9ec3c3ca5f3f000832
Auto-generated-cl: translation import
2016-01-27 07:25:34 -08:00
Sudheer Shanka
6a83d7537d Merge "Made changes to menu items in WifiSettings and AccountSyncSettings." 2016-01-27 15:15:29 +00:00
Sudheer Shanka
ce71ae91e5 Merge "Add padlocks to more preferences in wireless settings." 2016-01-27 15:15:06 +00:00
Abodunrinwa Toki
e55afb181b Merge "Settings app: Remove "Toggle keyboard shortcuts helper" button" 2016-01-27 15:12:02 +00:00
Geoff Mendal
9f044351ba Merge "Import translations. DO NOT MERGE" 2016-01-27 14:44:12 +00:00
Geoff Mendal
2047d56528 Import translations. DO NOT MERGE
Change-Id: Iac589baa34417f61e2b483886f14d51ea81c90e3
Auto-generated-cl: translation import
2016-01-27 06:35:44 -08:00
Jason Monk
eede8d563e Merge changes I81380323,I0cce76f3
* changes:
  Add wallpaper suggestion if one isn't set.
  Add DND Suggestion after 30 days
2016-01-27 14:19:42 +00:00
Sudheer Shanka
7ff7ea1e7f Made changes to menu items in WifiSettings and AccountSyncSettings.
When the admin has set disallow_config_wifi, menu items are not added.
we need to check if the menu items can be added after this fragment is
resumed. And for remove account menuitem, check whether any admin has
disabled management of a specific account type.

Change-Id: I58f5a59fe0614c9bc7068b15f43f89527939359d
2016-01-27 14:08:44 +00:00
Tony Mak
32ccffc07c Default apps setting for managed profile
1. Print settings already support managed profile. Follow the UI of that.
ProfileSettingsPreferenceFragment is created to act as the base class
for per-profile setting.

2. Only show browser and dialer default setting in managed profile.

BUG=26707733

Change-Id: I20d00203e14db58ec03638f692dd83a1bd50c59c
2016-01-27 14:01:16 +00:00
Clara Bayarri
c83d21c7d3 Merge "Fix Profile Fingerprint Settings to use correct user id" 2016-01-27 12:50:09 +00:00
Clara Bayarri
4f5f7b4f9a Fix Profile Fingerprint Settings to use correct user id
Bug: 26790762
Change-Id: Id813c03041e6e727f535ec63f63ee8b187b06164
2016-01-27 12:46:17 +00:00
Abodunrinwa Toki
635725d458 Merge "Fix comment." 2016-01-27 11:52:24 +00:00
Abodunrinwa Toki
7adce5463a Fix comment.
Change-Id: Ie4a535d2bf46a1ac3380ca8dbcf0b6665760ecb2
2016-01-27 11:51:27 +00:00
Clara Bayarri
40c0bf3ffc Merge "Show unification option only when it will result in a compliant lock" 2016-01-27 10:59:09 +00:00
Samuel Tan
03a117bcfa Display warning if users does not provide CA cert in EAP config
Display an explicit warning in the WiFi configuration menu if
the user selects the option to not validate the EAP server (i.e.
does not provide a CA certificate) in an EAP configuration.

BUG: 26686071
Change-Id: I73620b60defdcf40865f8c67d5de24b5dad636f8
TEST: Warning appears when the abovementioned option is selected.
2016-01-26 17:45:32 -08:00
Samuel Tan
30f7b5a7cf Add menu options for not specifying a EAP CA cert and User cert
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.

Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.

BUG: 26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
2016-01-26 17:45:32 -08:00
Samuel Tan
933b6ed98f Disable configuring EAP-TLS without user certificate.
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.

Also:
- change the wording of the default option for
  EAP CA and user certificates from "(unspecified)" to
  "Please select", to make it obvious that a choice
  needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.

BUG: 26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
2016-01-26 17:23:11 -08:00
Udam Saini
7ad4a17c5c Adds screen lock as a suggested activity
Also, fixes a bug where the suggested activity stayed on screen
after the component was disabled causing a crash.

bug:25246207
bug:26770556
Change-Id: I28d784cdc57e464e49887483690ab514ca3bc46a
2016-01-26 17:09:02 -08:00
Sanket Padawe
30e812b731 [DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Bug: 15162357
Change-Id: I9b1be9837b104670adc1cc7ed47a5095ff38d335
2016-01-26 16:51:39 -08:00
Rubin Xu
a8d2fb4a6a Merge "resolve merge conflicts of 55d7fcbfc2 to master." 2016-01-27 00:35:52 +00:00
Rubin Xu
b557817abc resolve merge conflicts of 55d7fcbfc2 to master.
Change-Id: Ib0876ea153e8a8f7c8ad5438915d39c9ae97e51b
2016-01-27 00:34:53 +00:00
Shishir Agrawal
91d921904f Merge "Unhiding MSIM APIs." 2016-01-27 00:32:29 +00:00
Rubin Xu
55d7fcbfc2 Merge "Support multiple CA certs when editing a saved Wifi network." into mm-wireless-dev 2016-01-27 00:26:59 +00:00
Rubin Xu
e34ea11fca Support multiple CA certs when editing a saved Wifi network.
SSID with multiple CA certs can only be added programmtically. However it
can still be edited in the UI by long-pressing the item when currently
connected to the network. This change makes sure the UI shows up with
 meaningful indications that the SSID is configured with multiple CA certs.

Bug: 22547958
Change-Id: I5d42313efb141db521dd09ff3fbc520915b6fb79
2016-01-27 00:25:10 +00:00
Sudheer Shanka
8b8683068f Add padlocks to more preferences in wireless settings.
Also set the userRestriction attribute in xml instead of
checking in WirelessSettings class and set useAdminDisabledSummary
attribute.

Change-Id: I0494bd18752425f9d4f3f7d0f64f21fcba0d26da
2016-01-27 00:25:03 +00:00
Udam Saini
06dc55d6ce Merge "Removes fingerprint onboard screen" 2016-01-27 00:18:41 +00:00
Udam Saini
cce5339da7 Removes fingerprint onboard screen
This screen isn't used anymore. This also fixes some fingerprint
work in setup wizard to use the userId instead.

Change-Id: Icb1debaf7b2766069a53a75eab6152d6b816b03c
2016-01-26 15:48:37 -08:00
Udam Saini
f7853577b1 Merge "Fixes a bug where user couldnt add a new fingerprint" 2016-01-26 23:29:16 +00:00
Udam Saini
72506b61ab Fixes a bug where user couldnt add a new fingerprint
Short term fix as there seems to be more user related that
need to be fixed in here (renaming/deleting fingerprint)
in the fingerprint manager

bug:26799512
Change-Id: I5a5d63b0682095a31eeb4cdf07322a3129b0f343
2016-01-26 15:08:20 -08:00
Adam Lesinski
32255ccc13 Update FakeUid to match new methods in BatteryStats.Uid interface
Change-Id: I7574acbc11c93d93c965e4af80835a0dc59dc360
2016-01-26 15:04:35 -08:00
Jason Monk
b9e5d238b6 Add wallpaper suggestion if one isn't set.
Change-Id: I81380323f0d4f5af842a81028a763219958833bc
2016-01-26 17:48:29 -05:00
Sudheer Shanka
a78572cf39 Merge "Update the text shown when admin disabled fingerprint as unlock option." 2016-01-26 22:36:06 +00:00
Jason Monk
4a60c8876e Add DND Suggestion after 30 days
Suggest users setup automatic rules if they haven't after 30 days

Also fix the id labeling for the RV adapter, so that it can handle
removing of suggestions properly.

Change-Id: I0cce76f3db1d444011f7d8a31348714d102650cf
2016-01-26 17:29:59 -05:00
Sudheer Shanka
49e9f612d1 Merge "Add restricted padlock support for listpreference." 2016-01-26 22:29:43 +00:00
Shishir Agrawal
d2b0fc066c Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
2016-01-26 13:48:21 -08:00
Sudheer Shanka
550d068abd Add restricted padlock support for listpreference.
Change-Id: I1f3284a474d225df803abd57dd71382cb1dfa659
2016-01-26 21:40:49 +00:00
Julia Reynolds
679fde4c15 Merge "Show app level settings when app doesn't use topics." 2016-01-26 21:21:05 +00:00
Philip P. Moltmann
3ed1752141 Merge "No need to declare minSdkVersion for Settings app." 2016-01-26 21:17:51 +00:00