Commit Graph

25070 Commits

Author SHA1 Message Date
Jorim Jaggi
75b22c67fc Enable multi-dex for incremental settings builds
Change-Id: I265eb5ff508206bd5b4205db612c3519bb9a5ed8
2016-01-29 15:15:18 -08:00
Noah Wang
5488b4e64c Merge "Adding placeholder for preview screens for screen zoom (magnifying screen)" 2016-01-29 21:45:54 +00:00
Ido Ofir
cae4bb354d Remove payments from settings suggestions.
Bug: 26770145

Change-Id: I269b78cfde45bd4a9c1669bc9425676404d54188
2016-01-29 13:32:20 -08:00
Paul Lawrence
fb4c583dba Don't show 'unlock at boot' for file encryption
Change-Id: I8906023942a2fa0c5c303aeabb48737ec43fc737
2016-01-29 13:25:36 -08:00
Adrian Roos
0586321e96 Merge "Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e" 2016-01-29 20:44:15 +00:00
Adrian Roos
ef5445f8c2 Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e
Bug: 19003093
Change-Id: I0e1dddb57e347c81d01abb7025144fadf6e53fe4
2016-01-29 12:35:37 -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
Julia Reynolds
fe22e8998b Link to external settings activity from the app header.
Bug: 26288458
Change-Id: Ib7c723f23a09f2dbcb6c9738db8e455fb7b82462
2016-01-29 10:15:31 -05:00
Benjamin Franz
a1f84c745d Merge "Read default confirm credentials title from policy" 2016-01-29 11:38:56 +00:00
Robin Lee
c6ce1793f7 Merge "Only setCredentialRequiredToDecrypt if primary user" 2016-01-29 11:02:57 +00:00
Robin Lee
5bb1e4fb90 Only setCredentialRequiredToDecrypt if primary user
Change-Id: I3b68cc1169296aa95777e12fa27c3ede4291ec78
2016-01-29 11:00:27 +00:00
Jeff Sharkey
a14dac2c8f Merge "Temporary hack to keep file:// Uris working." 2016-01-29 02:43:31 +00:00
Jeff Sharkey
a806f2bff4 Temporary hack to keep file:// Uris working.
Bug: 26860922
Change-Id: I29cc4f4328b829e75a4523bd4d710da3e872f59c
2016-01-28 19:03:18 -07:00
Yohei Yukawa
9329fd7a39 Merge "Support ACTION_KEYBOARD_LAYOUT_SETTINGS." 2016-01-28 23:58:31 +00: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
Andrei Stingaceanu
33e9656a53 Settings - disable notification settings for suspended apps
When we suspend an app we disable notifications for the app
(via notification manager as in Settings). While an app is
suspended do not allow the user to reach the
NotificationSettings screen.

Bug: 22776761
Change-Id: Ia0dbad6adce64b7d9238e1215a37c73e192dbc45
2016-01-28 21:21:54 +00:00
Udam Saini
79706ea0ea Merge "Dynamically checks if screen lock suggestion is needed" 2016-01-28 21:21:16 +00:00
Udam Saini
62a7280cb8 Dynamically checks if screen lock suggestion is needed
Fixes a bug where if you upgrade a device with screen lock,
screen lock suggestion would show (upgrade such as N->N developer
builds) or from a user test case like M->N

bug:26844580
Change-Id: Ic779ff28f5895e407c2c96771dbbc622e6026a7f
2016-01-28 13:03:54 -08: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
Sudheer Shanka
2020e056e1 Merge "Update view state of the items in listpreference." 2016-01-28 19:59:58 +00:00
Benjamin Franz
6e2821dc1a Read default confirm credentials title from policy
Use the organization name as default header text for the work
challenge. If an app passes a different header text, this will get
priority.

Bug: 26638631
Change-Id: I09a5bd7172ff1eed0ff97be02818e838a1a0a520
2016-01-28 19:55:03 +00:00
Mihai Niță
96d1496f55 Merge "Fixed trash icon for language removal" 2016-01-28 19:31:04 +00:00
Mihai Nita
45c6174216 Fixed trash icon for language removal
Bug: 26758729
Change-Id: I31f5b8d018c62a4d03619ee39c86bd96456f90ab
2016-01-28 11:16:20 -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
Jason Monk
41b761ad0d Merge "Clean up CellDataPreference dialog problems" 2016-01-28 18:15:35 +00:00
Jason Monk
d0682d0363 Clean up CellDataPreference dialog problems
Bug: 26830672
Change-Id: I189f8b2120143ca9829feebd24cf2ee93a33f05b
2016-01-28 13:10:24 -05: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
Sudheer Shanka
a412f477ec Update view state of the items in listpreference.
Bug: 26842763
Change-Id: Ie10c89626031f6bbfaa22564f056f371a4e81acb
2016-01-28 17:53:53 +00:00
Mihai Nita
0c7bce8222 Sentence-case the locale list.
Bug: 26730313
Change-Id: I015c50cb0e82cf3f5ad88a57d43d39e7202cf62d
2016-01-28 09:36:09 -08:00
Shweta Chahar
3ba50d858a Merge "Add a seekbar to change text-to-speech rate and a switch to enable higher speech rates." 2016-01-28 14:52:37 +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
Yohei Yukawa
7c4499da26 Support ACTION_KEYBOARD_LAYOUT_SETTINGS.
This CL let the Settings app accept
Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS like other activity actions
such as ACTION_INPUT_METHOD_SETTINGS and
ACTION_INPUT_METHOD_SUBTYPE_SETTINGS.

Bug: 25752827
Change-Id: I3244d9af400f9344359c1b5cfc1a5c1d9268ec8c
2016-01-27 19:18:52 -08:00
Adam Lesinski
af1f84a0cd Merge "Update FakeUid to match new methods in BatteryStats.Uid interface" 2016-01-28 00:03:57 +00:00
shwetachahar
8bd2feb9ec Add a seekbar to change text-to-speech rate and a switch to enable
higher speech rates.

Change-Id: I75cfc2af4e293dc45c93a44e5c2af73d1dae9b7c
2016-01-27 23:52:11 +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
Samuel Tan
802d22e159 Display warning if users does not provide CA cert in EAP config
am: 03a117bcfa  -s ours

* commit '03a117bcfaf7c3628da8f2fe57d9be69056dcdf1':
  Display warning if users does not provide CA cert in EAP config
2016-01-27 22:07:51 +00:00
Samuel Tan
5f94ee265e Add menu options for not specifying a EAP CA cert and User cert
am: 30f7b5a7cf  -s ours

* commit '30f7b5a7cfddc7bc3b0faa8aec3740f58dd514c3':
  Add menu options for not specifying a EAP CA cert and User cert
2016-01-27 22:04:30 +00:00
Samuel Tan
a292ef6b28 Disable configuring EAP-TLS without user certificate.
am: 933b6ed98f  -s ours

* commit '933b6ed98fc2209c57e067fcfec21791497f7811':
  Disable configuring EAP-TLS without user certificate.
2016-01-27 22:01:09 +00: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
Sanket Padawe
a2a134f79a [DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
am: 30e812b731  -s ours

* commit '30e812b7317d5f7e6eb6ca28c02c016e6b3cbf7e':
  [DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
2016-01-27 18:59:45 +00:00
Jason Monk
d3ac239e32 Add wifi calling suggestion
Change-Id: I737736d675fe0a4606ff1ccfd7d4ec6b69e1fd73
2016-01-27 13:58:49 -05:00