Commit Graph

24981 Commits

Author SHA1 Message Date
Benjamin Franz
ed5a75a476 Merge "Revert "Read default confirm credentials title from policy"" 2016-02-01 16:34:26 +00:00
Benjamin Franz
ff3d76dfd4 Revert "Read default confirm credentials title from policy"
This reverts commit 6e2821dc1a.

Bug: 26895493

Change-Id: I27e7199dc25d423219d966f9f2cbd671bbf094c7
2016-02-01 16:29:15 +00:00
Geoff Mendal
f75e1b1390 Import translations. DO NOT MERGE am: 66382c5667 -s ours am: 5f050823b1 -s ours
am: ec2416947d  -s ours

* commit 'ec2416947dd45e54ef5c837a0af0b4e121a77dae':
  Import translations. DO NOT MERGE
2016-02-01 15:44:53 +00:00
Geoff Mendal
066a5e2a3b Import translations. DO NOT MERGE am: 67603ccc01 -s ours
am: ff50dbd224  -s ours

* commit 'ff50dbd22459e984f4aa17a79abf7f26c2936020':
  Import translations. DO NOT MERGE
2016-02-01 15:43:02 +00:00
Geoff Mendal
ec2416947d Import translations. DO NOT MERGE am: 66382c5667 -s ours
am: 5f050823b1  -s ours

* commit '5f050823b1ceb2f0f789e9d13cf009f323c70040':
  Import translations. DO NOT MERGE
2016-02-01 15:43:02 +00:00
Geoff Mendal
ff50dbd224 Import translations. DO NOT MERGE
am: 67603ccc01  -s ours

* commit '67603ccc0154a12e3bd08ea96bfda012098c024f':
  Import translations. DO NOT MERGE
2016-02-01 15:41:11 +00:00
Geoff Mendal
5f050823b1 Import translations. DO NOT MERGE
am: 66382c5667  -s ours

* commit '66382c5667eec5411e0043b8668237f04b0e6f25':
  Import translations. DO NOT MERGE
2016-02-01 15:41:10 +00:00
Geoff Mendal
67603ccc01 Import translations. DO NOT MERGE
Change-Id: I807c37bd4191712a2408d46f35cf88caf72f1f75
Auto-generated-cl: translation import
2016-02-01 07:33:16 -08:00
Geoff Mendal
66382c5667 Import translations. DO NOT MERGE
Change-Id: Ie7dce1455e8b29196b023509228f876c105f5705
Auto-generated-cl: translation import
2016-02-01 07:24:56 -08:00
Geoff Mendal
061ebd7c23 Merge "Import translations. DO NOT MERGE" 2016-02-01 14:35:28 +00:00
Geoff Mendal
ddfa55d59e Import translations. DO NOT MERGE
Change-Id: I0e45cffaaf587a0fd84d06c592fc7e512d1915e0
Auto-generated-cl: translation import
2016-02-01 06:34:43 -08:00
Jason Monk
67c54102ec Merge "Fix dream settings initial state." 2016-02-01 14:27:58 +00:00
Clara Bayarri
c8457a8605 Merge "Make Lockscreen Notification Content work for profiles" 2016-02-01 10:09:18 +00:00
Jason Monk
77467e04d4 Fix dream settings initial state.
The empty view wasn't being updated initially by the fragment
so it was being left in an empty state since no preferences are
added after the fact.

Bug: 25609200
Change-Id: Ib9aa02ba94bf7077d01892d96d79d39203047f4d
2016-01-30 12:15:11 -05:00
Jason Monk
b7a7158b18 Fix storage preference animating away
Init it during the onCreate so it just doesn't appear.

Bug: 25606221
Change-Id: I899521590eae8d12c09938f8aa77680e3e277742
2016-01-30 16:59:02 +00:00
Jorim Jaggi
7368750b4f Merge "Enable multi-dex for incremental settings builds" 2016-01-29 23:17:27 +00:00
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
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
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