Commit Graph

3647 Commits

Author SHA1 Message Date
Jeremy Klein
6895446453 Merge "Make TetherSettings use the new tether api." 2016-02-05 18:14:50 +00:00
Jeremy Klein
e3e7b95312 Make TetherSettings use the new tether api.
The new API handles all the provisioning logic so this area can
get significant code cleanup.

Change-Id: I4bcffb14b3ce26a01d17ec149599d63b0b4392f1
2016-02-04 18:58:14 -08:00
Jason Monk
58c6dd6eee Merge "Settings Visuals" 2016-02-04 19:47:43 +00:00
Jason Monk
322cfe8be0 Settings Visuals
Update the layouts to be more final, and support tablets better.

Move about to always be last.

Always see everything.

Change-Id: I4b804c9bfcd4d3b7f978a2617d5c2c2b1cdfa6e4
2016-02-04 14:37:35 -05:00
Alan Viverette
da8c8df1cd Merge "App grid preview for screen zoom" 2016-02-04 16:07:42 +00:00
Alan Viverette
1912725628 App grid preview for screen zoom
Change-Id: I718468dc03800d125eea1c57c8e5dfbc84aa3367
2016-02-04 10:12:05 -05:00
Anna Galusza
4a05b2906f Merge "UI fixes (back arrow, blue switch bar, append whether Talkback is on to summary), Talkback no longer disabled when preference is tapped, fixes SettingsPreferenceFragment to not check parent class to determine whether to show options menu." 2016-02-03 21:40:08 +00:00
Jason Monk
0ec94e0064 Merge "String refinements touch -> tap" 2016-02-03 19:11:52 +00:00
Jason Monk
12fc8f6cff String refinements touch -> tap
Bug: 26562712
Change-Id: I8435f11e58098ec5eafad6204bc5426fe67205ab
2016-02-03 13:31:38 -05:00
Sudheer Shanka
0b3fbf5d66 Merge "Add padlocks to more preferences that can be disabled by admin." 2016-02-03 15:31:57 +00:00
Sudheer Shanka
ec1052dbad Add padlocks to more preferences that can be disabled by admin.
Bug: 26899715
Bug: 26767574
Bug: 26768057
Change-Id: I2dc590833cbee1e35047002ef554432f10ddc654
2016-02-03 00:24:52 +00:00
Anna Galusza
0285c80664 UI fixes (back arrow, blue switch bar, append whether Talkback is on to
summary), Talkback no longer disabled when preference is tapped, fixes
SettingsPreferenceFragment to not check parent class to determine whether to
show options menu.

Change-Id: I3345e1a878f51b4387ca1bfe89855339617a94d6
2016-02-02 14:48:28 -08:00
Julia Reynolds
e6d82b8d2f Merge "Clarify notification blocking in notification app list." 2016-02-02 19:46:35 +00:00
Samuel Tan
3848ddc1a0 Allow domain suffix match to be set in UI for EAP configurations
am: d54bbd5193

* commit 'd54bbd519303b8eb0a7822cea00c55ef5e4f6652':
  Allow domain suffix match to be set in UI for EAP configurations
2016-02-02 18:59:52 +00:00
Udam Saini
56a0a55ef0 Merge "Updates fingerprint icon and text for suggested activities" 2016-02-02 18:50:38 +00:00
Udam Saini
aafbba10ec Updates fingerprint icon and text for suggested activities
bug:25246207
Change-Id: I91669448c140b565d37563002a3ccbfb211d283b
2016-02-02 10:33:40 -08:00
Julia Reynolds
e07f385ae0 Clarify notification blocking in notification app list.
Change summary to: Normal (nothing blocked), Partially blocked
(at least one topic blocked), or Totally blocked (entire app
blocked).

Allow filtering on apps that are partially or totally blocked.

Bug: 26882239
Change-Id: I29924147a97a3d1693b0286d48905485e11edf1d
2016-02-02 12:52:24 -05:00
Abodunrinwa Toki
b5c00a2c3d Merge "Change the character limit for "Keyboard and input methods" string." 2016-02-02 16:30:01 +00:00
Abodunrinwa Toki
a295c75232 Change the character limit for "Keyboard and input methods" string.
Bug: 26856894
Change-Id: Ic8c6daea79d7f4e19246a6cf00610e5caf138389
2016-02-02 16:26:31 +00:00
Philip P. Moltmann
815665a14d Merge "Use same printer-list template as in the print spooler." 2016-02-01 23:42:07 +00:00
Clara Bayarri
c8457a8605 Merge "Make Lockscreen Notification Content work for profiles" 2016-02-01 10:09:18 +00:00
Samuel Tan
d54bbd5193 Allow domain suffix match to be set in UI for EAP configurations
Add a "domain" field that allows the user to specify a domain
suffix match for an EAP network configuration. This field
will only be available when the user specifies a CA certificate for
an EAP-PEAP, EAP-TLS, or EAP-TTLS network. Under the hood, the
value entered into this field will be passed to WPA supplicant
as the |domain_suffix_match| configuration variable.

BUG: 25180141
Change-Id: Ib69b9519f475e90e40441ddff61c80be43cf624b
TEST: On angler, domain field appears for the EAP-PEAP, EAP-TLS
TEST: and EAP-TTLS networks.
2016-01-29 15:40:43 -08:00
Maria Garcia Puyol
49323d3387 Merge "Add Emergency Info preference to user settings" 2016-01-29 19:24:20 +00:00
Philip P. Moltmann
83fb795e8a Use same printer-list template as in the print spooler.
Bug: 26780325
Change-Id: Ic333027aa0d158ad51608565af624b0c1cb10cfa
2016-01-29 10:49:08 -08:00
Adrian Roos
62775bf756 Move lock screen setting behind gear
Bug: 19003093
Change-Id: I15baa5b1d19324521070d641ae6a227d782a4e9e
2016-01-28 15:40:50 -08:00
mariagpuyol
60435fc81d Add Emergency Info preference to user settings
Bug: 26831671
Change-Id: I345fc9b9a54991de35c657e05cf3f08f21445f4c
2016-01-28 15:04:32 -08:00
Julia Reynolds
a7accd2064 Allow importance to be reset.
Change-Id: Ib2c2289631dfe4eb2aa09baf84d401eb2000c0d9
2016-01-28 17:27:22 -05:00
Noah Wang
8e10ddc209 Merge "Add entry point of screen zoom to accessibility and font size to display. Also removing large text preference." 2016-01-28 20:53:59 +00:00
Noah Wang
a6bb3d2307 Add entry point of screen zoom to accessibility and font size to display.
Also removing large text preference.

Change-Id: I076664edf1d1afd69385e34f9300bf5c0788b3e7
2016-01-28 12:49:38 -08:00
Noah Wang
b5abaf6bc8 Merge "Add instruction video to Screen Magnification a.k.a. Tap to Zoom screen." 2016-01-28 19:13:52 +00:00
Clara Bayarri
f6077f4757 Make Lockscreen Notification Content work for profiles
The settings for the Notification Content is user-dependent
and the correct values are used in the lock screen.

Bug: 26709332
Change-Id: I7acf94014771dacc2841da336bed645fdb948541
2016-01-28 17:54:39 +00:00
Daniel Sandler
ba9b20dae0 Merge "Revert "Add Emergency Info preference to user settings"" 2016-01-28 14:24:14 +00:00
Daniel Sandler
0def4c45b2 Revert "Add Emergency Info preference to user settings"
This reverts commit 0401388028.

Bug: 26831671
Change-Id: Ibe5ae3c7da400efb389f905b1111f029b6a8bfaf
2016-01-28 03:30:08 +00:00
Noah Wang
c14ed74482 Add instruction video to Screen Magnification a.k.a. Tap to Zoom screen.
Change-Id: Id02796ea44e48fe04351c9ea6bda66526f77a5cf
2016-01-27 15:24:46 -08:00
Samuel Tan
57c329c9f9 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-27 14:10:40 -08:00
Samuel Tan
f827c929dd 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-27 14:10:34 -08:00
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