Commit Graph

3811 Commits

Author SHA1 Message Date
Samuel Tan
fffc5936b9 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-27 14:10:25 -08:00
Jason Monk
4161d4e989 Merge changes Id18f3e9f,I737736d6
* changes:
  Add additional fingerprints suggestion
  Add wifi calling suggestion
2016-01-27 20:34:44 +00:00
Jason Monk
9d5c050ce0 Add additional fingerprints suggestion
Change-Id: Id18f3e9fffb1f9e964edb635689d3c7d410034fa
2016-01-27 14:39:22 -05:00
Jason Monk
d3ac239e32 Add wifi calling suggestion
Change-Id: I737736d675fe0a4606ff1ccfd7d4ec6b69e1fd73
2016-01-27 13:58:49 -05:00
Udam Saini
aa693f6734 Merge "Adds screen lock as a suggested activity" 2016-01-27 18:08:48 +00:00
Abodunrinwa Toki
e55afb181b Merge "Settings app: Remove "Toggle keyboard shortcuts helper" button" 2016-01-27 15:12:02 +00: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
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
Rubin Xu
b557817abc resolve merge conflicts of 55d7fcbfc2 to master.
Change-Id: Ib0876ea153e8a8f7c8ad5438915d39c9ae97e51b
2016-01-27 00:34:53 +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
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
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
Julia Reynolds
679fde4c15 Merge "Show app level settings when app doesn't use topics." 2016-01-26 21:21:05 +00: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
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
Maria Garcia Puyol
4ec12f7703 Merge "Add Emergency Info preference to user settings" 2016-01-26 19:00:51 +00:00
mariagpuyol
0401388028 Add Emergency Info preference to user settings
Bug: 23591361
Change-Id: I514cfcf79aef091483c5826414b0317b581cb055
2016-01-26 10:58:10 -08: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
Sudheer Shanka
0d9ac3469b Add padlock to location for work profile when disabled by admin.
Change-Id: Iee930c9340436cc68ee432ad15ec182ccc6fb0a1
2016-01-26 14:29:04 +00:00
Bartosz Fabianowski
d40c11a7d5 Merge "Allow user to specify whether a new network is shared or private" 2016-01-26 09:38:42 +00:00
Tony Mantler
6d70e7dce3 Merge "Move AccessPointPreference to SettingsLib" 2016-01-25 23:06:45 +00:00
Udam Saini
af677ddda4 Merge "Improves flow for fingerprint" 2016-01-25 23:02:32 +00:00
Sudheer Shanka
ba1a68b8ab Add preference summary when disabled by admin.
Change-Id: Iaa84e66b0abe0fccde50f116cbf6e68c6abbabc0
2016-01-25 22:39:34 +00:00
Makoto Onuki
7a89f68f95 Merge "Add "Uninstall" button to device admin activation dialog." 2016-01-25 22:10:23 +00:00
Makoto Onuki
c548848fba Add "Uninstall" button to device admin activation dialog.
Bug 25392386

Change-Id: I91259ddd69bc61a7dd23a2e8b4d08719bc5cacca
2016-01-25 14:09:24 -08:00
Jason Monk
e3bd8f0dc4 Merge "Add data saver to settings" 2016-01-25 20:36:56 +00:00
Jason Monk
764f45db91 Add data saver to settings
Bug: 22817899

Change-Id: Ic3055aa6a5baae1653db350313366f180c049cc7
2016-01-25 15:24:29 -05:00
Tony Mantler
99b255c8a5 Move AccessPointPreference to SettingsLib
Change-Id: Ib4a7c64e976aed5e75ec04fa72e2fdbd12923371
2016-01-25 10:42:53 -08:00
Mihai Nita
0fdbfe4928 Fix for build break (http://ag/844107)
The commit removed a string that was still used by AndroidManifest.xml

Change-Id: I32633546cfebcbb96066d80ff801c1d49b435f59
2016-01-25 10:26:43 -08:00
Bartosz Fabianowski
1058c0cc3d Allow user to specify whether a new network is shared or private
* Add a check box to the WiFi configuration dialog that lets the user
  choose whether a newly created configuration is shared with other
  users (defaults to true)
* Disable the check box when modifying an existing network

BUG=25600871

Change-Id: Ifc6713602ee61b0407e55f45097c1b311fa19cb4
2016-01-25 18:47:39 +01:00
Udam Saini
bf1483c383 Improves flow for fingerprint
This reduces the # of screens, and makes the backup lock choice
for fingerprint more obvious that it is a backup.

bug:26377096
Change-Id: I4e75e1f3302c286587de106bcdf43537bda03390
2016-01-25 09:19:02 -08:00
Sudheer Shanka
5590e2eb44 Update the text shown when admin disabled fingerprint as unlock option.
When the admin has disabled fingerprint as unlock option, we let the
user know that the admin has disabled that option with a more details
link which will trigger the admin support dialog. And made some small
fixes apart from this.

Change-Id: I01021b952dc6fb29a65d37401a6411a6088d5cef
2016-01-25 15:12:07 +00:00
Clara Bayarri
14ff9a91fa Merge "Fix Confirm/Choose Credentials strings related to profile" 2016-01-25 13:33:06 +00:00
Clara Bayarri
34ec5f97fe Fix Confirm/Choose Credentials strings related to profile
The messages in ConfirmDeviceCredentials have been updated to
inform the user that the pattern/pin/password to be entered is
the profile one.

The strings in the confirmation dialog when the user removes
the lock have also been updated.

Ideally we would have a parametrized approach to strings here,
but capitalization makes it a hard problem.

Bug: 26706338, 26709116
Change-Id: I9f5508d6f449f9e572d65e5b2dcb15cca23832b3
2016-01-25 13:20:55 +00:00
Abodunrinwa Toki
a16852480f Merge "Change Input Settings UI flow." 2016-01-23 15:36:49 +00:00
Steve Pfetsch
f002f23f91 resolve merge conflicts of 259b6a8029 to master.
Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97
2016-01-22 17:43:33 -08:00
Steve Pfetsch
259b6a8029 Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev am: 76b29667df
am: 5ff50f2072

* commit '5ff50f2072880c76b6ad8486b5c35be9a39f9a29':
  Added toast message to color temperature setting
2016-01-22 22:29:47 +00:00
Abodunrinwa Toki
976bb3f459 Change Input Settings UI flow.
1. Introduces new UI components as per the new flow
2. Temporarily disables components in the old flow that are to be
   replaced by the new flow. This is done so we can neatly revert
   to the old flow if there are issues with the new flow
3. AvailableVirtualKeyboardActivity now responds to
   android.settings.INPUT_METHOD_SETTINGS intents instead of
   InputMethodAndLanguageSettingsActivity

Bug: 25752812
Change-Id: I728d7ee185827ed328c16cb7abce244557a26518
2016-01-22 18:24:44 +00:00
Anna Galusza
f9d330448b Merge "Make A11y SUW launchable from SUW and small UX changes based on last round of UX studies." 2016-01-22 17:56:19 +00:00