Commit Graph

25097 Commits

Author SHA1 Message Date
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
Philip P. Moltmann
02b7cfec17 No need to declare minSdkVersion for Settings app.
Change-Id: I2b221ed2bb410578e57475dbbe0106826bfc3f76
2016-01-26 13:14:42 -08:00
Abodunrinwa Toki
c8da2e13a5 Settings app: Remove "Toggle keyboard shortcuts helper" button
Change-Id: I93bd51a05a8922e02e4e09add94d247442f67334
2016-01-26 21:10:15 +00:00
Abodunrinwa Toki
bfae9dd7f2 Merge "Input settings: Associate keyboard layouts with device/IME subtype." 2016-01-26 21:00:46 +00:00
Abodunrinwa Toki
c043de9fbf Merge "Settings app: Include package icons in list of virtual keyboards" 2016-01-26 20:59:15 +00:00
Abodunrinwa Toki
5f0b59babf Input settings: Associate keyboard layouts with device/IME subtype.
Implements selection of keyboard layouts using the new InputManager
methods that associate keyboard layouts to
device/InputMethodInfo/InputMethodSubtype
See: Ie88ce1ab77dbfe03ab51d89c1dc9e0a7ddbb3216

Bug: 25752812
Change-Id: Ib76880d66391ca37978054de80f4b3b5147cecc3
2016-01-26 20:57:06 +00:00
Julia Reynolds
92ea89c356 Show app level settings when app doesn't use topics.
Change-Id: I3c31a1bdddc70077182ea910911de1444472b7a9
2016-01-26 15:38:28 -05:00
Jason Monk
2e634f872e Merge "Support changes to SuggestionParser" 2016-01-26 19:52:56 +00:00
Maria Garcia Puyol
4ec12f7703 Merge "Add Emergency Info preference to user settings" 2016-01-26 19:00:51 +00:00
Jason Monk
91ca519a0f Support changes to SuggestionParser
Change-Id: I002e10cfe2a058f934d2c6218c88c2588654733f
2016-01-26 13:58:25 -05:00
mariagpuyol
0401388028 Add Emergency Info preference to user settings
Bug: 23591361
Change-Id: I514cfcf79aef091483c5826414b0317b581cb055
2016-01-26 10:58:10 -08:00
Sudheer Shanka
b2ed2d8583 Merge "Add policy disabled msg as empty views in zenmode related fragments." 2016-01-26 18:41:19 +00:00
Philip P. Moltmann
1147faa461 Merge "Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly." 2016-01-26 18:25:54 +00:00
Shishir Agrawal
3cc18408c6 DO NOT MERGE : Unhiding MSIM APIs.
am: 2e1370e9a5  -s ours

* commit '2e1370e9a5575ee92891f7e9fac25cf597e0354d':
  DO NOT MERGE : Unhiding MSIM APIs.
2016-01-26 18:03:51 +00:00
Shishir Agrawal
2e1370e9a5 DO NOT MERGE : 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 09:32:39 -08:00
Clara Bayarri
0ed7d8cb3e Merge "Profile Challenge Fingerprint Support" 2016-01-26 15:51:27 +00:00
Clara Bayarri
d3ca4fb300 Show unification option only when it will result in a compliant lock
Change-Id: I05ce21e8949c81313bc686273a9cec93bf5f2a9f
2016-01-26 15:45:42 +00:00
Clara Bayarri
40db4bbbb5 Profile Challenge Fingerprint Support
Change-Id: Ic83c479f645776dd0678721bfb732b399f09c992
2016-01-26 15:45:37 +00:00
Jason Monk
b2e357c788 Remove info icon from app header
Instead make the app header clickable, launch if coming from app list
and finish if coming from app info.

Bug: 26288458
Change-Id: I7f10a2385356107812dedc8de5d5761b1200e320
2016-01-26 14:46:43 +00:00
Jason Monk
7eda1c5fa1 Merge "Only show settings drawer on top level items" 2016-01-26 14:46:05 +00:00
Jason Monk
7cd90e012c Merge "Move Home settings to Default apps" 2016-01-26 14:45:25 +00:00
Jason Monk
7ea14c5625 Move Home settings to Default apps
Change-Id: I2ac7f9dd2c1c505ff3163b2a90c574a360b9409c
2016-01-26 09:44:39 -05:00
Sudheer Shanka
4e88857db7 Merge "Add padlock to location for work profile when disabled by admin." 2016-01-26 14:42:30 +00:00
Sudheer Shanka
052916efcb Merge "Add preference summary when disabled by admin." 2016-01-26 14:42:05 +00:00