Steve Pfetsch
259b6a8029
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev am: 76b29667df
...
am: 5ff50f2072
2016-01-22 22:29:47 +00:00
Steve Pfetsch
5ff50f2072
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
...
am: 76b29667df
2016-01-22 22:21:34 +00:00
Steve Pfetsch
76b29667df
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
2016-01-22 22:07:54 +00:00
Oleksandr Peletskyi
239e8a895f
Merge "Added check of the restriction if a user is allowed to change their icon. BUG: 25305966"
2016-01-22 20:31:41 +00:00
Jason Monk
478c592bf3
Only show settings drawer on top level items
...
Bug: 26080590
Change-Id: Id5047ef89832eb455719cd57b0e853a97d538a69
2016-01-22 15:20:20 -05: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
Robin Lee
a6420cdb57
Merge "Convert credential view to DialogFragment"
2016-01-22 17:46:02 +00:00
Robin Lee
04046a1976
Convert credential view to DialogFragment
...
Bug: 26352310
Change-Id: Ic6af37c893eec5a83e198b9f23ebd766e88e0109
2016-01-22 17:36:17 +00:00
Maurice Lam
6e68a1cd36
Merge "Use RestrictedRadioButton in SetupRedactionInterstitial"
2016-01-22 17:17:38 +00:00
Benjamin Franz
cc8d37a4c6
Read work challenge background color from device policy
...
Call into DevicePolicyManager to retrieve the background color that
should be used for the work challenge on the user whose credential
screen we're about to show.
Change-Id: I612dd96020ce8932b49b21e6ff6faaddd39f957d
2016-01-22 12:34:46 +00:00
Benjamin Franz
454ce75a41
Merge "Add background image for work challenge"
2016-01-22 12:27:00 +00:00
Oleksandr Peletskyi
ef1584312b
Added check of the restriction if a user is allowed to change their icon.
...
BUG: 25305966
Change-Id: I35fda2e4f157463d69a109409c3f8767d54eab4a
2016-01-22 11:57:44 +01:00
Kenny Root
9ceeeb6c02
resolve merge conflicts of bdc6074276 to master.
...
Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359
2016-01-21 19:30:35 -08:00
Maurice Lam
bb044a8cad
Use RestrictedRadioButton in SetupRedactionInterstitial
...
Bug: 26704975
Change-Id: I857dc0e57d1aaada06be4945b0e377291864ea89
2016-01-21 18:09:43 -08:00
Kenny Root
bdc6074276
Merge "Stop using AlgNameMapper"
...
am: 8646736618
2016-01-21 22:12:38 +00:00
Kenny Root
8646736618
Merge "Stop using AlgNameMapper"
2016-01-21 21:53:11 +00:00
Jason Monk
e07c947ea3
Fix build.
...
Change-Id: I43201fc9bb989d3f490ba26cb93956878745e366
2016-01-21 14:15:46 -05:00
Sudheer Shanka
1da7221476
Merge "Add padlocks to preferences that can be disabled by policy."
2016-01-21 19:07:02 +00:00
Sudheer Shanka
4cd2b33dec
Merge "Add padlock to usb modes when disabled by admin."
2016-01-21 18:46:17 +00:00
Steve Pfetsch
8897655d2e
Added toast message to color temperature setting
...
Added a toast message to inform the user that the color temperature
setting is applied once the display is off.
Bug:26110238
Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
2016-01-21 10:44:51 -08:00
Sudheer Shanka
1c3fd76ee0
Add padlock to usb modes when disabled by admin.
...
Change-Id: I8504febd78f083eb3ff88926fe29d69edc62b6ef
2016-01-21 18:41:05 +00:00
Clara Bayarri
450ebb586e
Merge "Fix bugs around unification when no password is set"
2016-01-21 17:50:17 +00:00
Philip P. Moltmann
be37bdff48
Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly.
...
Change-Id: If22acfee7c6a7c21803fe79ff04f33181dd10167
2016-01-21 09:16:25 -08:00
Andres Morales
e32497c6de
Track ro.flash.locked bit to enable/disable OEM unlocking pref
...
if the device is OEM unlocked already, disable the OEM
unlocking pref. If it's locked, enable.
Bug: 26039090
Change-Id: I915f3cf57deef8f5775d466dec59c891c1546b1b
2016-01-21 08:30:31 -08:00
Clara Bayarri
7402b25143
Fix bugs around unification when no password is set
...
- When in a unified state, selecting the work lock to be "none" caused
a security exception
- When the work lock was set to "none", unifying didn't work
- When in a unified state, the work lock type selection screen showed
"none" as the current type instead of the device lock type
Bug: 26577247
Change-Id: I853d77186e23b6a458eaa6c1047942a7eefddc9c
2016-01-21 15:27:38 +00:00
Jason Monk
34de9f6bf8
Protect against missing subscriptions
...
Bug: 26676464
Change-Id: I428dd60e6774f7ca88423edb7a87e51ee8a7dadd
2016-01-21 09:43:35 -05:00
Benjamin Franz
194300dff3
Add background image for work challenge
...
If the challenge shown is for a work profile, add the default image and
color to the background of the fragment.
Change-Id: I148c6cd3a835a84c7bac78b020839dfdae4a6c36
2016-01-21 14:15:31 +00:00
Benjamin Franz
d11b713a9f
Change build targets for settings tests
...
1. Split existing tests into fully automatable (unit/) and not fully
automatable (app/)
2. Revert previous changes to test runners on app/
3. Fix some typos in readme
This will enable us to add the fully automatable test target
SettingsUnitTests to the continuous integration tests on the platform.
Change-Id: I0f42c59fde84891e4bfc379150c2f0c61ce1329f
2016-01-21 12:32:15 +00:00
Benjamin Franz
ad1a279ac1
Merge "Add unit tests to Utils"
2016-01-21 10:43:30 +00:00
Adam Lesinski
2e6e7d1095
Merge "Add bt traffic accounting"
2016-01-21 02:22:05 +00:00
Kenny Root
1b291c13f4
Stop using AlgNameMapper
...
AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.
Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
2016-01-20 15:50:57 -08:00
Anna Galusza
b1795f5549
Make A11y SUW launchable from SUW and small UX changes based on last round of
...
UX studies.
Change-Id: I9c20cd3abf910a37731da2af604f3af2cd30e942
2016-01-20 15:42:58 -08:00
Sudheer Shanka
021dcb06e1
Merge "Add restricted padlocks to radio buttons."
2016-01-20 21:10:04 +00:00
Sudheer Shanka
4cc507ec4c
Merge "Trigger a support dialog when an action is disabled by policy"
2016-01-20 21:09:27 +00:00
Sudheer Shanka
ef550767b0
Trigger a support dialog when an action is disabled by policy
...
Change-Id: I847b481a16cce33fe7bd4040d38ec50ca62172c2
2016-01-20 21:00:44 +00:00
Mihai Nita
d7d48fda53
Implement multiple locales and sublocales in Settings
...
Does drag-and-drop reordering, supports adding / removing locales,
suggestions, search, removes locales already selected in the
user preferences.
Bug: 25800339
Change-Id: Iffe7b9810c77ec93a84d848ab20b2ba405249676
2016-01-20 12:31:11 -08:00
Benjamin Franz
11805d159c
Add unit tests to Utils
...
1. Switch to AndroidJUnitRunner
2. Add mockito support
3. Add tests for Utils class
Change-Id: I1eabfdf1d65456d71363b8970beee9239a90ada2
2016-01-20 18:45:36 +00:00
Geoff Mendal
ae7e15b730
Import translations. DO NOT MERGE am: ffb0eb03a7 -s ours am: 97898c5cd2 -s ours
...
am: a3bb93f1cc
2016-01-20 18:16:34 +00:00
Sudheer Shanka
737dab827e
Merge "Check for MANAGE_DEVICE_ADMINS permission instead of uids."
2016-01-20 18:09:54 +00:00
Geoff Mendal
a3bb93f1cc
Import translations. DO NOT MERGE am: ffb0eb03a7 -s ours
...
am: 97898c5cd2
2016-01-20 17:52:58 +00:00
Geoff Mendal
cdd5748df1
Import translations. DO NOT MERGE am: bcefb0397f -s ours
...
am: c42498eddb
2016-01-20 17:50:13 +00:00
Sudheer Shanka
682a916836
Add padlocks to preferences that can be disabled by policy.
...
Change-Id: I43b6b5954ef6ec65b86d99321cabab9f49df842d
2016-01-20 17:48:27 +00:00
Geoff Mendal
c42498eddb
Import translations. DO NOT MERGE
...
am: bcefb0397f
2016-01-20 17:43:14 +00:00
Geoff Mendal
97898c5cd2
Import translations. DO NOT MERGE
...
am: ffb0eb03a7
2016-01-20 17:41:58 +00:00
Jason Monk
b484d74d73
Merge "Fix DataUsageSummary in no sim state."
2016-01-20 16:37:01 +00:00
Jason Monk
71a2a4f89b
Fix DataUsageSummary in no sim state.
...
Bug: 26676464
Change-Id: I7fad5240f1160a2eb38a7cff2ae2f1c9e40bc4d3
2016-01-20 11:33:46 -05:00
Sudheer Shanka
1901ae3b3b
Add restricted padlocks to radio buttons.
...
Change-Id: Ibaf312a4c6c5fd9126ab7d45ccb094fc1bd46a1f
2016-01-20 16:26:56 +00:00
Julia Reynolds
7b9a1a1995
Merge "Add default alarm ringtone to sound settings."
2016-01-20 16:16:07 +00:00
Julia Reynolds
193e7b044d
Add default alarm ringtone to sound settings.
...
Bug: 25957833
Change-Id: I68d6747894665c97853eabac7edb0f751d1fdcc1
2016-01-20 11:10:49 -05:00
