Commit Graph

79 Commits

Author SHA1 Message Date
Fabrice Di Meglio
b86a2bc745 FR #16136331 Search - results should be ordered with match on Title and then on SubTitle
- issue two queries instead of one. The first is for matching on the Title
and the second is for matching on the SubTitle (but use EXECEPT clause for
filtering out the potential dupe results that may be coming from the Title)
- use a MergeCursor for aggregating the two Cursor

Change-Id: I0ba4bb227dbd4a113348da8ed788ca7cded986fb
2014-07-08 11:03:14 -07:00
Jason Monk
0e6ffc429d Merge "Add lock-to-app to settings" 2014-06-26 18:35:29 +00:00
Fabrice Di Meglio
74ef69a7d1 Fix WifiSettings / AdvancedWifiSettings indexing
- fix typo for the declaration of the SearchIndexableResource for
AdvancedWifiSettings that was not the correct one

See bug: #12910134 Implement Search into the Settings App

Change-Id: I964ca7ae4ba75a382af099e023383fc00773c844
2014-06-26 15:50:33 -07:00
Jason Monk
315070d58b Add lock-to-app to settings
Lock-to-app when disabled shows some instructions about how to
enable it and use it.

When enabled shows an option of use lock screen, which controls
whether the device is locked when exiting lock-to-app.  Turning
on use lock screen requires that the device have some security
challenge.

Bug: 15759649
Change-Id: I6188243e03fb0c85bdfdbc32a23ad486296a34f9
2014-06-26 11:09:54 -04:00
Fabrice Di Meglio
c9711beb3c Add Search / Indexing to Data Usage / Mobile Hotspots
- implement a BaseSearchIndexProvider and pass all the needed
strings to index (including the Wi-Fi SSIDs)

Change-Id: Ic7a640c76cd7c2af77585e87e216b283af61a29e
2014-06-17 12:30:18 -07:00
John Spurlock
69323ad96a am e9ee5e2c: Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev
* commit 'e9ee5e2cede8d7e8fd7791113903df7eff1ec75a':
  Settings: Battery saver settings sub-page.
2014-06-11 17:02:20 +00:00
John Spurlock
c7f8e8ce69 Settings: Battery saver settings sub-page.
New battery saver settings page, accessed via
the power usage settings overflow menu.

The settings page has a master switch to toggle
battery saver mode, feature disclosure text,
and a preference to configure the automatic
trigger level.

Remove developer checkbox now that this option
has a real home.

NO_SQ: multi project change
Bug:13329308
Change-Id: Iac54238f3406439711b44a3c17f220ac5e370a37
2014-06-10 17:26:47 -04:00
Fabrice Di Meglio
c6dacf5e56 am c9548c17: Merge "Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present" into lmp-preview-dev
* commit 'c9548c17471ff7d7826a769593250ca3467a2ba5':
  Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present
2014-06-07 10:01:14 +00:00
Fabrice Di Meglio
dba577f8f0 Fix bug #15460001 "Cell broadcasts" setting search suggested in wifi only device though setting is not present
- implement a BaseSearchIndexProvider for WirelessSettings
- fix Context passed to the Index: now use an ApplicationContext
- also use the correct Context when dealing with Settings SearchIndexProvider
- also makes impossible a rogue BaseSearchIndexProvider to crash Settings
if not well behaving
- last, fix icon used for "NFC & more" search results

Change-Id: I8b5cc999fa57a9e1977ee57394801d54cf3dbabb
2014-06-06 16:35:41 -07:00
Adrian Roos
f7c460d8d6 am 4e2104b1: Merge "Follow up to "A better brightness"" into lmp-preview-dev
* commit '4e2104b1191e5c3a049ebc159150fbb9a7bc2d03':
  Follow up to "A better brightness"
2014-06-04 18:08:32 +00:00
Adrian Roos
8ab0954a24 Follow up to "A better brightness"
Original change I122e1218dd0072c979a59bdafd3e0b6f4eec99ab was missing
search provider logic adjustments and length limits on the added strings.

Bug: 15313133
Change-Id: I8910dd60111c87f5494db7bac76a351e89c1a99b
2014-06-03 00:00:11 +02:00
Fabrice Di Meglio
23c6666a88 Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
Manual report of 0897f975c1

 - clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources

Change-Id: I3ab77677f3d926b0a3eb9be5d77ee23b568856aa
2014-05-30 17:59:00 -07:00
Fabrice Di Meglio
90be51d539 Fix the build
- somewhat LMP Previe and Master has diverged
- fix the missing symbol
- add the missing ChooseLockGeneric.ChooseLockGenericFragment in the
ranking Map

Change-Id: Ib978763b5bb093d8192749604a62bb15f6904289
2014-05-30 16:58:07 -07:00
Fabrice Di Meglio
b438c13265 am 2aa32299: Merge "Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev
* commit '2aa322991da364b9be74a6e13a4de314765eadd1':
  Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app
2014-05-30 22:39:53 +00:00
Fabrice Di Meglio
b2385ea462 Fix bug #15335840 "Safety information" search suggestion shown though
..."Safety information" setting is not available in settings app

- implement a SearchIndexProvider for DeviceInfoSettings and
remove some Preference indexing depending on the device state
and configuration
- remove old non used Preferences
- some code cleaning

Change-Id: I3b2c9dc7cb9f1137b553fed9330aeea4020bd2f8
2014-05-30 15:35:06 -07:00
Fabrice Di Meglio
cac94ba246 am 2bc41e29: Merge "Fix bug #15342475 Settings search ranking improvement" into lmp-preview-dev
* commit '2bc41e29b99961cbb3d879b1b45e4b14d8a5f3e1':
  Fix bug #15342475 Settings search ranking improvement
2014-05-30 21:33:47 +00:00
Fabrice Di Meglio
eed44c9d5f Fix bug #15342475 Settings search ranking improvement
- introduce the "base rank" concept. All SearchIndexablesProvider
will have a base rank and the Settings one will get a "0" base rank.
- use a map whose key is the authority name for the provider to get
and store the base rank
- if a base rank is not defined, use the current max defined one and
increment it to define the new one.

Then we will compute the real rank this way:

rank = (providerRank > 0) ? baseRank + providerRank : baseRank

Change-Id: Ifa82bfcdfc07f25c4a5f304f47550686f7d4c13d
2014-05-30 14:05:32 -07:00
Fabrice Di Meglio
21300597d1 Merge "FR #15314612 - Enable search on non accentuated chars" 2014-05-28 23:23:15 +00:00
Fabrice Di Meglio
62909fd0cd Merge "Search - prepare for better normalization" 2014-05-28 23:22:55 +00:00
Fabrice Di Meglio
363348dd8b FR #15314612 - Enable search on non accentuated chars
- update normalization step. Use a Normalizer for a string
decomposition to the NFD form and remove those diacritics with
a "\\p{InCombiningDiacriticalMarks}+" pattern.

See bug #15314612 Search - need to be able to search and have results
with non accentuated chars

Change-Id: Ifaf4cd2ca2fb712e1c6f5f5272f942dda99464e4
2014-05-28 16:20:38 -07:00
Fabrice Di Meglio
a8ac78b392 Search - prepare for better normalization
- code refactoring

See bug: #15314612 Search - need to be able to search and have results
with non accentuated chars

Change-Id: Ic3eb94c0effccf6592c02b3eaa78bf26a2d09714
2014-05-28 15:56:30 -07:00
John Spurlock
6926224f73 am 4e4cdeff: Settings: Remove sound settings.
* commit '4e4cdeffdb6087c953f44808f14f18554a749bda':
  Settings: Remove sound settings.
2014-05-28 20:52:56 +00:00
John Spurlock
4e4cdeffdb Settings: Remove sound settings.
- Move the remaining conditional preferences into
  the combined Sound & Notifications screen.
- Refactor the "Other sounds" sub-settings screen to
  provide a home for the new preferences.
- Migrate docking sounds, conditional on config.
- Migrate docking media, conditional on config.
- Migrate emergency tones, conditional on CDMA.
- Move all boilerplate preference <-> setting plumbing into
  a separate helper.
- Since some preferences in Other sounds are now conditional,
  create a special indexer for searching.
- Remove SoundSettings (and xml), create aliases in the manifest
  to avoid breaking shortcuts.

Bug:15279526
Change-Id: I5ae3ecda2f899b1948f7908bd217a799326c2c56
2014-05-28 16:37:43 -04:00
John Spurlock
0d6b7183b5 am 66548844: Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-dev
* commit '665488441761a0d6cae2498eff935de31a1a7f9f':
  Settings: Hide phone-related settings on tablets.
2014-05-27 19:26:04 +00:00
John Spurlock
57c713d1d9 Settings: Hide phone-related settings on tablets.
Bug:15002393
Bug:15091008
Change-Id: I8238b7990572f46e1530a800897ab2d39a189055
2014-05-27 14:39:02 -04:00
Fabrice Di Meglio
0897f975c1 Add Indexing and Search for ChooseLockGenericFragment
- clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources

Change-Id: I867a1e11905cc4059d6eccabeab04d55cc3d799e
2014-05-23 18:17:09 -07:00
Fabrice Di Meglio
a218d0ed73 Sixth batch of new Quantum Theme assets - DO NOT MERGE
- needed for Quantum Theme support

See bug #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292
(cherry picked from commit 5847373448)
2014-05-23 19:31:21 +00:00
Fabrice Di Meglio
5847373448 Sixth batch of new Quantum Theme assets
- needed for Quantum Theme support

See bug #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292
2014-05-22 19:17:36 -07:00
Fabrice Di Meglio
b58b28e13e Fix bug #14494292 Settings>Search>Recent searches keep on populating the same keyword if it is searched again
- do the right thing: remove the previous search queries from the Database if needed
so that there will be no dupe

Change-Id: I707eb518ea7c2a64b1407c62ff164e249fe03fa9
2014-05-20 16:31:52 -07:00
John Spurlock
ac1c42f5dc Clean up search metadata for notification pages.
Remove custom providers for screens added purely via xml.
Add data keys for those that remain.

Change-Id: I28172a1937e40e853f929f3332e3640e63b65141
2014-05-19 15:24:34 -04:00
John Spurlock
81bef1d745 VolumeZen: Sound & Notifications settings.
- Add sound settings under the newly combined Sound & Notifications
  top-level settings page.
- New slider preferences for setting audio stream volumes.
- Migrate checkbox prefs to switch prefs.
- New settings subpage for touch sounds.
- New settings subpage for "Showing notifications"
- New setting pref for displaying intercepted notifications in zen mode.
- New tri-state lockscreen notifications pref.
- Add priority + sensitivity options to app notification dialog.
- Remove badges on app notifications row, migrate to subtitle text.
- Migrate strings to common spot in strings.xml
- Remove heads up setting.
- Remove tweaks category (unused).
- Clean up notification settings, separate out into a code section per option.
- Clean up _settings.xml files, prefix each pref with option name.
- Add appropriate indexing data to each settings page.

Depends on f/b change Ic30aa575ae07650cee62c8c1d83b6bc69395cf0d

Change-Id: If700385a7d0057f6c4c4bcf6e648dcf88b8ebff2
2014-05-18 15:37:09 -04:00
Fabrice Di Meglio
0869526b81 Fix bug #14903618 Developer Options - string changes needed to the Bug report checkbox
- string update as follow:

LABEL

Current string:
- "Power menu bug reports"

Change to:
- "Bug report shortcut"

SECONDARY TEXT

Current string:
- "Include option in power menu for taking a bug report"

Change to:
- "Show a button in Quick Settings for taking a bug report"

Change-Id: Ibc716e1ae0bc3d553601908efd81babd66051d8b
2014-05-14 18:51:03 -07:00
Fabrice Di Meglio
55638cb6c6 Fix NPE when going into WiFi Settings
- this was occuring when updating the Index for remembered WiFi networks

Change-Id: Ifc8f843499e09150685a8dd9bfb705459f28c067
2014-05-09 20:07:13 -07:00
Fabrice Di Meglio
34483748df Fix bug #14324070 Settings search does not include any of wifi sub-settings
- add AdvancedWifiSettings to the Index
- bump the database version to force a re-indexing at the first start

Change-Id: I45aacfe6e0bb38a1209ea8dd2c4ccf0f1b90a526
2014-05-09 19:08:44 -07:00
Svetoslav
149c1361f1 DynamicIndexableContentMonito should respect lacking software features.
We have software features that are optional and developers should check if
these feature are available before use their APIs which are nop if the feature
is not present. DynamicIndexableContentMonito is observing changes in print
services and IMEs but printing and IMEs are optional features. Now we are
checking before tracking these features.

bug:14653371

Change-Id: I3003c645e637aa7d7118c80b4453a54b8ac8bf9a
2014-05-08 14:45:46 -07:00
Fabrice Di Meglio
d297a58402 Add saved Search queries feature
- update SearchResultsSummary fragment to have two lists:
one for Search suggestions (saved queries) and one for
Search results
- a tap on a saved query will launch that Search query
- show the list of saved queries when tapping on the SearchView
- do some fancy hidding / unhidding of the saved queries list
and results list

Change-Id: If15055ab78b0ec5eef4e543173dc7b866bd08e27
2014-04-23 10:35:10 -07:00
Fabrice Di Meglio
891bbfdbb7 Merge "Save Search queries" 2014-04-22 01:38:47 +00:00
Fabrice Di Meglio
ab791fccf9 Save Search queries
- update database model for adding a table for saving a query
and its timestamp
- update database version
- save the query when the User tap on a Search result
- remove old queries (no more than 5 are saved)

Change-Id: I4ddff0ad660944c7fd53be64ac95397850dc60d0
2014-04-21 18:35:30 -07:00
Fabrice Di Meglio
4bedf88f3d Merge "Fix missing summary for CheckBoxPreference" 2014-04-21 23:41:13 +00:00
Fabrice Di Meglio
b7390ba585 Fix missing summary for CheckBoxPreference
- "summaryOn" and "summaryOff" were parsed but we were missing
also "summary"

Repro case: search for "adt" (from Developer options)

Change-Id: Ifa829ec6c6f86cb426432f716c2d28df8550f9ea
2014-04-21 16:40:48 -07:00
Fabrice Di Meglio
2ce2fd2085 Merge "Fix bug #14228591 NPE in settings app when it is launched by UiAutomator" 2014-04-21 22:35:06 +00:00
Fabrice Di Meglio
6d7bb92b38 Fix bug #14228591 NPE in settings app when it is launched by UiAutomator
- test for null references

Change-Id: Iff6efc92cc16ada9f6e8f057ba9c23a241e62000
2014-04-21 15:32:28 -07:00
Fabrice Di Meglio
62a3ab41dc Merge "Enable Search result highlight for Accessibility and IME settings" 2014-04-21 20:29:12 +00:00
Fabrice Di Meglio
bb26141ddf Enable Search result highlight for Accessibility and IME settings
- add missing keys
- update Database version to force re-indexing (because the keys
were missing)

Change-Id: I7533d86b0f9d79d838e5c16d4bc51b7b09dffae5
2014-04-21 13:27:23 -07:00
John Spurlock
4a35051565 App-level notification configuration settings page.
New sub-page off of notification settings to ban/unban
apps and navigate to an app's notification configuration
activity (if configured).

Centralized all notification settings artifacts under a new
settings subpackage.

Bug: 13935172
Change-Id: I53b75c02f0091900734d17dc9217035d0df9b466
2014-04-21 12:19:14 -04:00
Fabrice Di Meglio
f2a5226c1e Improve Preference highlighting
- use PreferenceFragment.onBindPreferences() to launch  highlighting
- improve SettingsPreferenceFragment code for highlighting: now we can
find the View to highlight thru its Tag if there is no ListAdapter available
- add HighlightingFragment for highlighting a View from its tag/key. This
is dealing with cases when the content is custom and not relying on
SettingsPreferenceFragment (like DataUsageSummary)

Also:

- improve DataUsageSummary so that onResume() is not recreating the
Tabs all the time
- add missing "android:keys" on some Security Settings preference files

Change-Id: Ib1dd8238fe2fb57c151d584c0810a0e0a5ad97c4
2014-04-18 13:42:46 -07:00
Fabrice Di Meglio
8f5c65fd01 Search results - just show the first item of ListPreference entries
- need to increment the database model version to force re-indexing
- change entries separator from SPACE to PIPE
- just show the first entries value in the Search results

Change-Id: I747218ff3528c3231c0209f8870c12f65e036070
2014-04-15 14:09:25 -07:00
Fabrice Di Meglio
7a6bfd132c Update DynamicIndexableContentMonitor
- use factory for creating Intents
- add missing case in handlePackageUnavailable() for IMEs
- move DynamicIndexableContentMonitor to the "search" package

Change-Id: I8d74b28fb9183827db50c6de4b4543b4ff21acc0
2014-04-15 13:31:38 -07:00
Svetoslav
990159abaa Adding search for dynamic accessibility settings.
The language and input settings are highly dynamic and this change adds search
support for that. This category depends on installed IMEs, input devices, user
dictionary configuration, etc. We not only compute the right preferences to be
indexed but also track related system state in the settings app to rebuild the
index if needed.

bug:14066763

Change-Id: Ia89d9e35bd79abf8d74614691aedf4ca9b11b6f2
2014-04-14 17:31:23 -07:00
Fabrice Di Meglio
09e13da6a7 Some code cleaning
- use MatrixCursor var as in the other cases

Change-Id: Iba1163a851e62de9a0dd6e7c1c5d28f06452bdba
2014-04-14 17:01:02 -07:00