Julia Reynolds
25cb8f0691
Use id-based zen rule APIs.
...
Also names no longer have to be unique.
Bug: 22977552
Change-Id: I8dbee85c15d12d5380345447047a0d49c903522e
2015-10-08 13:07:07 -04:00
Toni Barzic
496f099752
Merge "Add a11y setting for Automatically click after pointer stops"
2015-10-07 18:25:09 +00:00
Wale Ogunwale
b4d7efbfa2
Revert "Added Developer Options settings for multi-window mode."
...
This reverts commit 4c9d667bc2
.
Bug: 24462906
Bug: 19494313
Change-Id: Iaa698868d8896a09c377b5da03c20b2a0b72d253
2015-10-07 09:24:23 -07:00
Wale Ogunwale
4472dc4b6a
Revert "Remove multi-window developer setting from search index if disabled."
...
This reverts commit 77dab4be64
.
Bug: 24462906
Bug: 19494313
2015-10-06 22:26:23 +00:00
Toni Barzic
76be5e352a
Add a11y setting for Automatically click after pointer stops
...
Adds new preference screen for the feature, where the feature can be
enabled/disabled, and delay before click can be specified (implemented
as seek bar preference, enabled iff the feature is enabled).
Preference is added to Accessibility setting. The preference summary is
set to string describing the delay after pointer stops moving before
click is scheduled (the string also contains numerical value of the
delay).
BUG=20049245
Change-Id: Ib7b2f5c24efbd08e3200143c069bcdbc9b5a327a
2015-10-05 14:19:04 -07:00
Maurice Lam
ef9d636376
Merge "[WifiSettings] Add Wi-Fi dialog activity"
2015-10-01 17:24:52 +00:00
Julia Reynolds
239986eec9
Merge "Update zen rule type selection and view."
2015-10-01 12:36:14 +00:00
Zach Kuznia
c39dc017a7
am ff66f8b5
: am 24cb6374
: am a8f3f067
: am ae8aea76
: Merge "Allow manual to be read from disk" into mnc-dr-dev
...
* commit 'ff66f8b5f11248a9dfb66ef23d2c6a5be4847fdb':
Allow manual to be read from disk
2015-10-01 00:34:22 +00:00
Zach Kuznia
ff66f8b5f1
am 24cb6374
: am a8f3f067
: am ae8aea76
: Merge "Allow manual to be read from disk" into mnc-dr-dev
...
* commit '24cb6374df50a6ea5978fb9851e4030ac9924307':
Allow manual to be read from disk
2015-10-01 00:28:33 +00:00
Zach Kuznia
a8f3f067b6
am ae8aea76
: Merge "Allow manual to be read from disk" into mnc-dr-dev
...
* commit 'ae8aea76e5cbef1eefde401f8622d05275156cf7':
Allow manual to be read from disk
2015-10-01 00:15:52 +00:00
Zach Kuznia
ae8aea76e5
Merge "Allow manual to be read from disk" into mnc-dr-dev
2015-10-01 00:08:05 +00:00
Maurice Lam
e618babe5a
Merge "Remove outdated setup wizard widgets"
2015-09-30 20:41:15 +00:00
Julia Reynolds
f7748e4ae1
Update zen rule type selection and view.
...
Separate rule type selection from naming, launch 3P UI for non-system rules.
Bug: 22977552
Change-Id: Ifbd82da2192c4aaf5f239a188a016d9e1af542d6
2015-09-30 16:00:19 -04:00
Julia Reynolds
7d8a9aead5
Use public APIs for modifying automatic zen rules.
...
Bug: 22977552
Change-Id: I544f1462ad77cdeb33ccff3c9de11ea37df5505d
2015-09-30 08:57:47 -04:00
Maurice Lam
1556f3c371
Merge "[Settings] Remove dependency from SUW nav bar"
2015-09-29 17:02:43 +00:00
Maurice Lam
63b63e4950
Remove outdated setup wizard widgets
...
Illustration and StickyHeaderListView are now provided as part of
setup wizard library. Cleaning up the old implementations.
Change-Id: I3a7738cb2c918122fd7e8e484b5bbb648fddd931
2015-09-28 17:13:56 -07:00
Maurice Lam
820ee63716
[Settings] Remove dependency from SUW nav bar
...
Remove setup wizard navigation bar as one of setting's dependencies,
since all the users are using setup wizard library, which includes
the navigation bar as one of its components.
Change-Id: I4ce2b8639155b813a782115725c88d5b1c5c8bfc
2015-09-28 14:57:20 -07:00
Julia Reynolds
6c7f7e2688
Merge "Use public APIs to update DND policies."
2015-09-28 19:20:54 +00:00
Julia Reynolds
f02aa0cef4
Use public APIs to update DND policies.
...
Bug: 22977552
Change-Id: I42d3da4052b9212505920b30bb2e24c3e56bc603
2015-09-28 14:51:22 -04:00
Fyodor Kupolov
1f432586b3
Moved restricted profile setup logic to UserManagerService
...
Bug: 24212155
Change-Id: Iea214877dd856e830a42467780b7407b8991c52d
2015-09-28 10:03:35 -07:00
Bart Sears
3ecabc5411
Merge "Revert "Moved restricted profile setup logic to UserManagerService""
2015-09-26 02:02:14 +00:00
Bart Sears
fbd126e423
Revert "Moved restricted profile setup logic to UserManagerService"
...
This reverts commit 151dffcd64
.
Change-Id: If98fddcfc8f46c77e3491f7a9fc918ed3752a0e8
2015-09-26 02:00:46 +00:00
Fyodor Kupolov
d905197f56
Merge "Moved restricted profile setup logic to UserManagerService"
2015-09-25 22:48:04 +00:00
Maurice Lam
694a76ac69
am 0764cbf4
: am 177db306
: am 2fd785e0
: am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '0764cbf4025d1e756347f4c46abe94faff10977c':
[Fingerprint] Fix link accessibility
2015-09-25 19:00:02 +00:00
Maurice Lam
0764cbf402
am 177db306
: am 2fd785e0
: am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '177db306c5b623409abac10b58914a0350f50b87':
[Fingerprint] Fix link accessibility
2015-09-25 18:07:45 +00:00
Maurice Lam
2fd785e099
am 655ddae8
: [Fingerprint] Fix link accessibility
...
* commit '655ddae8b52191633f0052617feb511b0bc02945':
[Fingerprint] Fix link accessibility
2015-09-25 01:01:57 +00:00
Maurice Lam
655ddae8b5
[Fingerprint] Fix link accessibility
...
Copied ExploreByTouchHelper, LinkAccessibilityHelper and LinkTextView
from setup wizard and switched fingerprint_settings_footer to use
LinkTextView, so that users can navigate to the link in TalkBack
mode.
Bug: 24343933
Change-Id: I0ff0c054510dfef4263ea223cb0044a4bddf321f
2015-09-24 16:28:27 -07:00
Xiaohui Chen
78873951d4
Merge "A tiny refactor in settings"
2015-09-24 21:24:36 +00:00
Fyodor Kupolov
151dffcd64
Moved restricted profile setup logic to UserManagerService
...
Bug: 24212155
Change-Id: Ifd19cf5833fb8f2d61cfd6d0019849aa27701c38
2015-09-24 12:59:34 -07:00
Jason Monk
7eda07bc5f
resolved conflicts for e0d175ed
to master
...
Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
2015-09-23 18:55:44 -04:00
Lifu Tang
4148f17616
Explicitly ask for option menu in Fragments
...
If a Fragment needs option menu, it has to ask for it explicitly by calling
setHasOptionsMenu(true). If a preference screen contains help URL, this
method is called automatically in the base class. However, if a preference
screen doesn't have help URL, this method will not be called. So any other
extra option menu will not be added correctly.
Typically we won't be able to see this bug. Because on standard Nexus builds,
all settings screen have their own help URL. But on AOSP build, as help URL
is empty by default, if the vendor doesn't modify the resource to provide
their own help URL, we'll end up missing some of the option menus.
Bug: 24241310
Change-Id: Iaabc91a1d102e21254b518ec23459025efbdcc84
2015-09-23 14:16:13 -07:00
Jason Monk
e0d175edc6
am 9f773870
: am 3b06fd8b
: am 16a8e8d1
: Make picture color mode less of a feature
...
* commit '9f773870361cb11729c6997e943a4e540324ea02':
Make picture color mode less of a feature
2015-09-23 21:00:23 +00:00
Jason Monk
3b06fd8b9d
am 16a8e8d1
: Make picture color mode less of a feature
...
* commit '16a8e8d1028c09abe8b083acf9da70e6d65ebb79':
Make picture color mode less of a feature
2015-09-23 20:44:16 +00:00
Jason Monk
16a8e8d102
Make picture color mode less of a feature
...
- Shun it to developer settings
- Hide 'natural' mode
- Remove dialog
Bug: 24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
2015-09-23 16:08:13 -04:00
Jim Miller
fa7f9b47f4
am e214210c
: am a564c950
: am 71cfa2f7
: am c5fa6e26
: Add a dummy string to help to add "fingerprint" to search
...
* commit 'e214210c3f0354bf14bb7156314b417e9af7310e':
Add a dummy string to help to add "fingerprint" to search
2015-09-23 02:31:18 +00:00
Jim Miller
e214210c3f
am a564c950
: am 71cfa2f7
: am c5fa6e26
: Add a dummy string to help to add "fingerprint" to search
...
* commit 'a564c950673a1d919b192f5bf3bc56e7b2f30d39':
Add a dummy string to help to add "fingerprint" to search
2015-09-23 02:23:58 +00:00
Jim Miller
71cfa2f794
am c5fa6e26
: Add a dummy string to help to add "fingerprint" to search
...
* commit 'c5fa6e26dffd43d8fab12117d7994d8ab6466048':
Add a dummy string to help to add "fingerprint" to search
2015-09-23 02:04:51 +00:00
Jim Miller
c5fa6e26df
Add a dummy string to help to add "fingerprint" to search
...
Fixes bug 24172006
Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
2015-09-22 18:30:13 -07:00
Zach Jang
386c7763eb
am 564ec935
: am 00721b4a
: am c87ceb7e
: am 6ceb2ba9
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '564ec9357bac62d571ba8ba9d58957477b8b5209':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 21:06:13 +00:00
Zach Jang
00721b4afa
am c87ceb7e
: am 6ceb2ba9
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:12 +00:00
Xiaohui Chen
538f6de918
A tiny refactor in settings
...
Change-Id: I5d3fb3f4ef86bb84de54a8992af476bbb58c2ee9
2015-09-21 10:14:56 -07:00
Xiaohui Chen
9965b1438b
Cleanup OWNER in Settings
...
Bug: 19913735
Change-Id: Iada650431328a304f7c1e6acb8cbde76e4210127
2015-09-21 10:14:49 -07:00
Julia Reynolds
cf92ef10a5
Updates to automatic rule listing page for 3P rules.
...
Show the provider app icon and name; allow deletion from
listing page; remove the rule summary for consistency.
Bug: 22977552
Change-Id: Ib71832fa4ff64b7321ade39f9964ac52cee6c643
2015-09-21 11:30:02 -04:00
Jim Miller
e2fb8f1d81
am 93fd2b5c
: am 2b620859
: am 50ee327f
: am d251fed3
: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
...
* commit '93fd2b5c3010b17be5391a1e0ae755e31ec9852c':
Add summary for 0 fingerprint settings preference
2015-09-19 18:15:05 +00:00
Justin Harrison
c591cdd69b
am fa9d8258
: am 8a44f2c4
: am a3add1d2
: am c6a96d40
: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
Add color transform setting
2015-09-19 18:14:36 +00:00
Paul Lawrence
ae4a557a3f
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
...
This reverts commit 4f60679b76
.
Bug: 24197523
Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
(cherry picked from commit b33741fce7
)
2015-09-19 17:31:08 +00:00
Paul Lawrence
e3d813eef8
am d1edd531
: am 57ca15e4
: am 0f1e7bfe
: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
...
* commit 'd1edd5318b46de5f4d28dca1954886660e05b972':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:56:58 +00:00
Paul Lawrence
57ca15e45e
am 0f1e7bfe
: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
...
* commit '0f1e7bfe19f2ca7598399712adaedf5acefcfb0b':
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:41:22 +00:00
Paul Lawrence
0f1e7bfe19
Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
2015-09-19 02:32:23 +00:00
Paul Lawrence
b33741fce7
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
...
This reverts commit 4f60679b76
.
Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
2015-09-19 02:29:37 +00:00