Commit Graph

5495 Commits

Author SHA1 Message Date
Lifu Tang
1bb6c75cdf Re-register listener for the switch upon onResume
- Fix b/13330300

Change-Id: I6a5f97c383913dd461ec30d4e30585d325287ccc
2014-03-12 11:55:30 -07:00
Narayan Kamath
cce74886eb am 677f32b1: am d4cf5c55: am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
* commit '677f32b1bb97b1c4f23af4315d401197b4857632':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
2014-03-11 15:21:11 +00:00
Narayan Kamath
d4cf5c5578 am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
2014-03-11 15:14:15 +00:00
Narayan Kamath
c776bbb156 Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 2014-03-11 15:07:14 +00:00
Narayan Kamath
0a2bc1cc76 Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
This reverts commit 9ebc27c73e.

Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
2014-03-11 13:05:37 +00:00
Fabrice Di Meglio
deb49d0f09 Merge "Remove duplicates into Search results" 2014-03-10 23:10:24 +00:00
Fabrice Di Meglio
489362c83c Remove duplicates into Search results
In schema version 100, we were using data_title and data_summary for
storing a normalized version of the title and summary.

This was leading to have duplicate results.

Now (in schema version 101), we are introducing two new colums for
storing normalized title and summary. We are also doing a new MATCH
query on those two new columns and that fixes the duplicates issue.

Change-Id: I609675cdd1a47a1a29595f0fe8b87ad96c6e4522
2014-03-10 16:00:50 -07:00
Fabrice Di Meglio
3386f55caa Merge "Fix bug #13394626 Settings app crashes on changing orientation to landscape mode" 2014-03-10 19:47:49 +00:00
Fabrice Di Meglio
b643cbf6d6 Fix bug #13394626 Settings app crashes on changing orientation to landscape mode
- fix NPE on mInitialHeader.id

Change-Id: Ic1017f5a8a20755bf7f36b1f3406d45dcc80ae8f
2014-03-10 12:18:39 -07:00
Fabrice Di Meglio
c6428c05fa Merge "Fix Drawer selection when using BACK" 2014-03-08 02:19:40 +00:00
Fabrice Di Meglio
75eabc20b9 Fix Drawer selection when using BACK
- select the initial Header if needed

Change-Id: I2d884fbab9a49cc3385dbe1b311f9e0853d027d3
2014-03-07 18:17:03 -08:00
Fabrice Di Meglio
9e8d173786 Merge "Close the Drawer on BACK button if the Drawer is opened" 2014-03-07 21:00:54 +00:00
Fabrice Di Meglio
c95be4fbb3 Close the Drawer on BACK button if the Drawer is opened
- otherwise (if Drawer is closed), BACK should work as BACK
into the Fragments BackStack

Change-Id: Ic7f500eb77f35e2142a40e6c9e34c4e7f0ec6428
2014-03-07 12:57:38 -08:00
Fabrice Di Meglio
bb74c5f1c9 Merge "Fix bug #13322417 stability-sys: Java crash in com.android.settings: ...java.lang.NullPointerException: Attempt to read from field ... 'long com.android.settings.SettingsActivity$Header.id' on a null object reference" 2014-03-07 19:23:43 +00:00
Fabrice Di Meglio
832e546185 Fix bug #13322417 stability-sys: Java crash in com.android.settings:
...java.lang.NullPointerException: Attempt to read from field
... 'long com.android.settings.SettingsActivity$Header.id' on a null object reference

- fix the AndroidManifest for missing meta data
- fix NPE causes in getHeaderTitle()
- update how we are putting Fragments on the BackStack

Change-Id: Ifc0bba744c3b2a0603c2f11f711ef493cbacc9d2
2014-03-07 11:18:36 -08:00
Fabrice Di Meglio
03f5624c8d Merge "Improve query filtering for Search" 2014-03-07 00:36:22 +00:00
Fabrice Di Meglio
0b63458c0b Improve query filtering for Search
- there was a crash when inputing "w" then "-" then "-". This
crash was due to the InputFilter which got some strange indices
from the BaseInputConnection.
- so now we are doing our own filtering before sending the query
to Sqlite. We only keep Letters / Digits / Spaces.

Change-Id: I66dcbebeec9217cf8fd65a16b10fe2304d98cf58
2014-03-06 16:31:12 -08:00
Fabrice Di Meglio
1488c12498 Merge "Fix bug #12910134 Implement Search into the Settings App" 2014-03-06 22:23:55 +00:00
Fabrice Di Meglio
0d4005a1c7 Fix bug #12910134 Implement Search into the Settings App
- optimize MATCH query. Basically instead of doing 3 UNIONs,
we are building a more clever MATCH query that can search on
data_title OR data_summary OR data_keywords.
- the consequence is that the generated SQL should be way more
efficient to process and should also get the results faster.
- last, as the generated SQL is shorter, it will be easier to
understand and debug for Humans :-)

Change-Id: I0f71740cae86b8c95ed88f9a5d13b8b4c860b1a9
2014-03-06 14:17:48 -08:00
Fabrice Di Meglio
a1b187acec Merge "Fix bug #13327889 Launching Wifi setting using available wifi network ...notification does not show ON/OFF button for wifi" 2014-03-06 18:46:54 +00:00
Tom O'Neill
140563c930 Merge "Remove some usages of deprecated location APIs" 2014-03-06 17:30:36 +00:00
Fabrice Di Meglio
565d8b7bcc Fix bug #13327889 Launching Wifi setting using available wifi network
...notification does not show ON/OFF button for wifi

- the notification was launching the WifiPickerActivity which is
a PreferenceActivity, so take care of this case too.

Change-Id: I64f58d4b9f75141626bb6f0266cf2f17fbb39fc7
2014-03-05 17:27:50 -08:00
Fabrice Di Meglio
835c5e4ef9 Merge "Fix bug #13322036 stability-sys: Java crash in com.android.settings: android.database.sqlite.SQLiteException: malformed MATCH expression: [ avs- /y@ggmd"*] (code 1)" 2014-03-06 00:27:40 +00:00
Fabrice Di Meglio
3ec129b1b5 Fix bug #13322036 stability-sys: Java crash in com.android.settings:
android.database.sqlite.SQLiteException: malformed MATCH expression: [ avs- /y@ggmd"*] (code 1)

- the real issue was linked to the double quote
- add an InputFilter to the query EditText so that we allow only
Letters / Digits / Spaces (and this should works for all Locales)

Change-Id: I6016cc25d154b386870379dfa4c79a40c5505530
2014-03-05 16:24:35 -08:00
Tom O'Neill
dad115e2db Remove some usages of deprecated location APIs
Bug: 13302202
Change-Id: I916568d2b310eaf9a8b30da9a9980344aaf76c21
2014-03-05 09:31:09 -08:00
John Spurlock
81ccaeac4f Update zen mode config view to reflect new default.
Change-Id: I5084d440a351dd2be1171139107220cab86718f6
2014-03-04 19:05:46 -05:00
Fabrice Di Meglio
72af648a1e Merge "Fix bug #13300024 Settings app crashes on changing device orientation" 2014-03-04 20:57:51 +00:00
Fabrice Di Meglio
4931d7cc16 Fix bug #13300024 Settings app crashes on changing device orientation
- remove crashing code. Basically let the Framework do its work.
No need to save the state of the EditText by ourselves.

Change-Id: I49e98a852f4fcda61eabaa2967d027942905ec27
2014-03-04 12:57:11 -08:00
Yuhao Zheng
8d4882c16b Merge "Make Setting UI use system proxy validity check" 2014-03-04 17:43:46 +00:00
Fabrice Di Meglio
6f0739a3d9 Add Search to the Settings App (initial release)
- add basic UI for search
- build the search Index thru sqlite FTS4 (faster than FTS3)
- create the search Index on the fly depending on the locale
- re-index if there is a configuration change
- re-index too if the Android build version has changed (usefull
for an Android OTA or when a new Android version is pushed as
we need to recompute the Index)
- search thru "title" and "summary" Preference's data
- group results in the same order of the Settings categories
into the Drawer
- rewrite "title" and/or "summary" if they are containing
an hyphen "\u2011"
- add Preference Keywords (only for the Settings App) in the
Index and allow search on them (Wi-Fi network preference is
used as an example)

Known restrictions:

- we cannot yet search for "dynamic settings"
- ... nor we cannot search for settings coming from an external App
(like the Phone App and its related settings that are surfacing
into the Settings App).
- will need a few other CLs to add more keywords (and have them translated)

Change-Id: I017a4d6c433f28c257c08cacc1bed98c4c517039
2014-03-03 14:46:17 -08:00
Fabrice Di Meglio
882e6cde60 Merge "Fix Drawer selection and initial Header" 2014-03-03 21:55:02 +00:00
Fabrice Di Meglio
6d534a1da5 Fix Drawer selection and initial Header
- now select the correct header when launching Settings shortcuts by
taking care of initial header
- also fix an issue when having to "double BACK" on the initial header
- some code cleaning (no need to test non null references)
- move code to group it by topics

Change-Id: Ifdf6dd7f5605e858b324d00165f0a5e8124efdfc
2014-03-03 20:18:43 +00:00
Yuhao Zheng
1f7a190fd7 Make Setting UI use system proxy validity check
Setting UI performs some validity check on proxy settings, such that user
can't click "Save" until inputs are valid. However, it uses a different
validity pattern than framework, such that user may still be able to click
"Save" but the changes are silently rejected by framework. Fixed by using
the system proxy validity check routine.

bug: 13248097
Change-Id: Ia1eef53588e6923a838cb5629e373697001a8ba6
2014-03-03 11:22:52 -08:00
Wei Wang
17d2124c1c Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87
2014-03-03 11:18:21 -08:00
Tom O'Neill
ee4f84b0fb Merge "Ignore any summary provided for injected settings" 2014-03-03 18:49:42 +00:00
Tom O'Neill
34501ae258 Ignore any summary provided for injected settings
Bug: 13279850
Change-Id: I1e5a39c9542b3121835f61cd0ce82612c7948cd7
2014-03-03 10:17:52 -08:00
Fabrice Di Meglio
947d8143b9 Merge "Fix Fragment BackStack and Titles" 2014-03-03 18:01:19 +00:00
Chris Wren
2ce3443984 Merge "rename heads up global setting: app part" 2014-03-03 15:26:01 +00:00
Matthew Xie
7f36c272c4 Merge "Update context on resume calls for BluetoothAdvertisingEnabler and BluetoothEnabler" 2014-03-01 22:20:34 +00:00
Chris Wren
18765d7094 rename heads up global setting: app part
Bug: 13208692
Depends-On: Ia020e4d63552ab4b8cbb8a37622c36776800a790
Change-Id: I73755ea40d7e741e9036a245bd9c70c976aeef1a
2014-03-01 10:36:01 -05:00
Chris Wren
f7890677df Merge "add a setting for the heads up: app part" 2014-03-01 00:06:55 +00:00
John Spurlock
7243806345 Zen mode configuration panel. (packages/apps/Settings)
Read-only version of the configuration screen for
Limited Interruptions.  Defaults to the logic implemented
for this mode, namely block notifications except for
Calls & Alarms.

This settings panel will serve as a target for the
configure affordance in SystemUI.

Change-Id: I33fd1e11ab76dbb7044bb94cb096cd892945947d
2014-02-28 17:44:40 -05:00
Chris Wren
ad1b7eb398 add a setting for the heads up: app part
Bug: 13208692
Depends-On: I6847f7a5f275aee2f608de0237dab0e45c39b33f
Change-Id: Ia410a473492aa7637449ba5a5dc068f98618ad03
2014-02-28 17:19:00 -05:00
Dianne Hackborn
0f9ab45376 Merge "Show new radio active times." 2014-02-28 02:03:16 +00:00
Fabrice Di Meglio
8eb3f0fbf2 Fix Fragment BackStack and Titles
Related to bug #12939786 and bug #13223838

- first use Fragment BreadCrumb for managing Titles and Back
- consider the first fragment as the initial one (both in the
normal case and in the shortcut one)
- fix usage of the Fragment BackStack so that in all cases we
are returning to the initial Fragment before exiting the App.

Change-Id: I96989d14f4e88688747b93ab9fadd96aea214a2c
2014-02-27 16:51:06 -08:00
Matthew Xie
47c5e9c831 am 31df7cdc: am b1140053: am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"
* commit '31df7cdcb31993c4c62bd1995af72fca57946e10':
  HTML injection fix for bluetooth pairing, issue 65946
2014-02-27 21:46:26 +00:00
Matthew Xie
b114005305 am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"
* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946
2014-02-27 21:39:34 +00:00
John Spurlock
adda1b0022 Zen mode settings.
Step 1: Surface zen mode value under sound settings.

This is in keeping with the principle that quick settings are
accelerators (not replacements) for settings in the Settings app.

Adding configuration to "Limited interruptions" will be done as
a followup, and will serve as the target for the configuration
icon in SystemUI.

Change-Id: Ia2c7351454b17df3e27926ff593eebff284ebef8
2014-02-27 15:43:40 -05:00
Rob Fletcher
7b0686af2f HTML injection fix for bluetooth pairing, issue 65946
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
2014-02-27 19:46:12 +00:00
Narayan Kamath
76dcc66f4a am c7bcddaa: am 729c83a4: am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
* commit 'c7bcddaa5ad2d6184ba296f53ed3c83f8f98f2b7':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-02-27 12:09:00 +00:00