OSDN Git Service
Fabrice Di Meglio [Thu, 13 Mar 2014 00:19:39 +0000 (17:19 -0700)]
More code cleaning
- use var for context.getResources()
- rename var
Change-Id: I8b8b7ffdd2c83bdbec7a4f162757597032aa9fb0
RoboErik [Wed, 12 Mar 2014 23:04:48 +0000 (23:04 +0000)]
am
64beb278: (-s ours) am
0b71937d: am
5791cecc: b/
12068020 Update calls to InputManager. Do not merge
* commit '
64beb278983aaa1dbd4115c50cc123be1b0ebc1a':
b/
12068020 Update calls to InputManager. Do not merge
RoboErik [Wed, 12 Mar 2014 21:15:48 +0000 (21:15 +0000)]
am
0b71937d: am
5791cecc: b/
12068020 Update calls to InputManager. Do not merge
* commit '
0b71937d304d701fb0edc1cd3720bcadb264d9f9':
b/
12068020 Update calls to InputManager. Do not merge
RoboErik [Wed, 12 Mar 2014 21:12:27 +0000 (21:12 +0000)]
am
5791cecc: b/
12068020 Update calls to InputManager. Do not merge
* commit '
5791cecc9e0a4169c71b87696973441071e295c8':
b/
12068020 Update calls to InputManager. Do not merge
Fabrice Di Meglio [Wed, 12 Mar 2014 20:19:34 +0000 (13:19 -0700)]
Code cleaning - class names
- use class names instead of their static string representation
Change-Id: I82ebfc087bc2bbadb9076c5750265bf400ff4224
Fabrice Di Meglio [Wed, 12 Mar 2014 19:58:05 +0000 (19:58 +0000)]
Merge "Add dynamic Preferences indexing"
RoboErik [Wed, 8 Jan 2014 01:34:38 +0000 (17:34 -0800)]
b/
12068020 Update calls to InputManager. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/
This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.
Change-Id: I9072c5b5c822b73188a6c572945f87b4a7c03139
Svetoslav [Wed, 12 Mar 2014 19:49:17 +0000 (19:49 +0000)]
Merge "Remove unused fields and imports."
Svetoslav [Wed, 12 Mar 2014 19:48:16 +0000 (12:48 -0700)]
Remove unused fields and imports.
Change-Id: If95879a506a9657b3dd370a35c1060712dcb9e93
Lifu Tang [Wed, 12 Mar 2014 19:46:51 +0000 (19:46 +0000)]
Merge "Re-register listener for the switch upon onResume"
Lifu Tang [Wed, 12 Mar 2014 18:55:30 +0000 (11:55 -0700)]
Re-register listener for the switch upon onResume
- Fix b/
13330300
Change-Id: I6a5f97c383913dd461ec30d4e30585d325287ccc
Dan Sandler [Wed, 12 Mar 2014 18:38:21 +0000 (18:38 +0000)]
Merge "Finally, a place for notification settings."
Fabrice Di Meglio [Wed, 12 Mar 2014 18:36:45 +0000 (18:36 +0000)]
Merge "Code refactoring"
Fabrice Di Meglio [Tue, 11 Mar 2014 02:24:54 +0000 (19:24 -0700)]
Add dynamic Preferences indexing
- introduce a new private interface "Indexable".
- refactor Wallpaper and Wi-Fi settings to support this new
interface.
- only index saved/remembered Wi-Fi networks
- also add the capability to remove some data from the Index.
Fragments that want to publish some dynamic indexable data should
implement the "Indexable" interface and provide a static final field
named "INDEX_DATA_PROVIDER" with is the Indexable.IndexDataProvider
interface for providing the data for indexing.
Thru this interface the Index can ask what are the data chuncks to
index.
Change-Id: I31e7212c87b8218efe1a8f3028147cb19e119be6
Dan Sandler [Tue, 11 Mar 2014 05:32:47 +0000 (01:32 -0400)]
Finally, a place for notification settings.
Consolidated under the new Notifications settings are:
- Ringtone (from Sound)
- Zen Mode (from Sound)
- Pulse LED (from Display)
- Heads-Up Notifications (from Display)
- Notification Access (from Security)
- Show when locked (from Security)
Change-Id: I214d03ba1e356e088323a3058d98d390b8a8f988
Baligh Uddin [Tue, 11 Mar 2014 17:37:48 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Narayan Kamath [Tue, 11 Mar 2014 15:21:11 +0000 (15:21 +0000)]
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.""
Narayan Kamath [Tue, 11 Mar 2014 15:17:28 +0000 (15:17 +0000)]
am
d4cf5c55: am
c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
* commit '
d4cf5c5578844ce9915aba178094313a9eeb8022':
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
Narayan Kamath [Tue, 11 Mar 2014 15:14:15 +0000 (15:14 +0000)]
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.""
Narayan Kamath [Tue, 11 Mar 2014 15:07:13 +0000 (15:07 +0000)]
Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
Narayan Kamath [Tue, 11 Mar 2014 13:05:37 +0000 (13:05 +0000)]
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
This reverts commit
9ebc27c73e7096159024605a2c4ab1a4b3abbd83.
Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
Fabrice Di Meglio [Tue, 11 Mar 2014 00:30:30 +0000 (17:30 -0700)]
Code refactoring
Change-Id: I053ab0c691295b81dc7aa0fd858fd609a69ade81
Fabrice Di Meglio [Mon, 10 Mar 2014 23:10:23 +0000 (23:10 +0000)]
Merge "Remove duplicates into Search results"
Fabrice Di Meglio [Mon, 10 Mar 2014 22:47:49 +0000 (15:47 -0700)]
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
Baligh Uddin [Mon, 10 Mar 2014 22:39:07 +0000 (15:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1690f2bfef7a44b6545da8cef61f06fa691b897
Auto-generated-cl: translation import
Fabrice Di Meglio [Mon, 10 Mar 2014 19:47:49 +0000 (19:47 +0000)]
Merge "Fix bug #
13394626 Settings app crashes on changing orientation to landscape mode"
Fabrice Di Meglio [Mon, 10 Mar 2014 19:18:39 +0000 (12:18 -0700)]
Fix bug #
13394626 Settings app crashes on changing orientation to landscape mode
- fix NPE on mInitialHeader.id
Change-Id: Ic1017f5a8a20755bf7f36b1f3406d45dcc80ae8f
Wei Wang [Sat, 8 Mar 2014 11:02:09 +0000 (11:02 +0000)]
am
9075a6e2: (-s ours) am
c8962d07: am
6663b245: am
a8e634ca: (-s ours) am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
9075a6e21c791792a3e110473ff97086972d5574':
DO NOT MERGE Change bluetooth off display message.
Fabrice Di Meglio [Sat, 8 Mar 2014 02:19:40 +0000 (02:19 +0000)]
Merge "Fix Drawer selection when using BACK"
Fabrice Di Meglio [Sat, 8 Mar 2014 02:17:03 +0000 (18:17 -0800)]
Fix Drawer selection when using BACK
- select the initial Header if needed
Change-Id: I2d884fbab9a49cc3385dbe1b311f9e0853d027d3
Wei Wang [Sat, 8 Mar 2014 02:15:01 +0000 (02:15 +0000)]
am
c8962d07: am
6663b245: am
a8e634ca: (-s ours) am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
c8962d077033ad78bba70b4ed7cb2fcc065f0e54':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:11:25 +0000 (02:11 +0000)]
am
6663b245: am
a8e634ca: (-s ours) am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
6663b24574c8a3b1e8bde7737a28299bef743f2f':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:07:30 +0000 (02:07 +0000)]
am
a8e634ca: (-s ours) am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
a8e634ca5367dde80873a0b7643e27284db56336':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:02:19 +0000 (02:02 +0000)]
am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
104eea0b97c63b97040dc26ddf3635257e1b19a2':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:00:36 +0000 (02:00 +0000)]
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
Fabrice Di Meglio [Fri, 7 Mar 2014 21:00:54 +0000 (21:00 +0000)]
Merge "Close the Drawer on BACK button if the Drawer is opened"
Fabrice Di Meglio [Fri, 7 Mar 2014 20:57:38 +0000 (12:57 -0800)]
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
Fabrice Di Meglio [Fri, 7 Mar 2014 19:23:43 +0000 (19:23 +0000)]
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"
Fabrice Di Meglio [Fri, 7 Mar 2014 03:12:14 +0000 (19:12 -0800)]
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
Rob Fletcher [Fri, 7 Mar 2014 03:02:59 +0000 (03:02 +0000)]
am
d58459cb: (-s ours) am
99fa7336: am
8ce54bd6: am
04f36983: (-s ours) am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
d58459cbb9d7949136d0646627502cc5ba466154':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Fabrice Di Meglio [Fri, 7 Mar 2014 00:36:22 +0000 (00:36 +0000)]
Merge "Improve query filtering for Search"
Fabrice Di Meglio [Fri, 7 Mar 2014 00:31:12 +0000 (16:31 -0800)]
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
Rob Fletcher [Thu, 6 Mar 2014 22:56:39 +0000 (22:56 +0000)]
am
99fa7336: am
8ce54bd6: am
04f36983: (-s ours) am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
99fa73361fd7a562b7ea193cd047604e902d6b2f':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Thu, 6 Mar 2014 22:51:57 +0000 (22:51 +0000)]
am
8ce54bd6: am
04f36983: (-s ours) am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
8ce54bd640ddab13416d7a105df63bf29df2ae45':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Thu, 6 Mar 2014 22:41:29 +0000 (22:41 +0000)]
am
04f36983: (-s ours) am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
04f3698345f804848ea7f03c6022dbdb0d8ac28d':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Fabrice Di Meglio [Thu, 6 Mar 2014 22:23:54 +0000 (22:23 +0000)]
Merge "Fix bug #
12910134 Implement Search into the Settings App"
Fabrice Di Meglio [Thu, 6 Mar 2014 22:17:48 +0000 (14:17 -0800)]
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
Rob Fletcher [Thu, 6 Mar 2014 21:59:31 +0000 (21:59 +0000)]
am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
549a39b49510dad27da588714f848dc891913239':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Tue, 25 Feb 2014 18:16:12 +0000 (18:16 +0000)]
DO NOT MERGE 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
Fabrice Di Meglio [Thu, 6 Mar 2014 18:46:53 +0000 (18:46 +0000)]
Merge "Fix bug #
13327889 Launching Wifi setting using available wifi network ...notification does not show ON/OFF button for wifi"
Wei Wang [Mon, 3 Mar 2014 22:58:54 +0000 (14:58 -0800)]
DO NOT MERGE Change bluetooth off display message.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
Baligh Uddin [Thu, 6 Mar 2014 17:37:56 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Tom O'Neill [Thu, 6 Mar 2014 17:30:36 +0000 (17:30 +0000)]
Merge "Remove some usages of deprecated location APIs"
Fabrice Di Meglio [Thu, 6 Mar 2014 01:27:50 +0000 (17:27 -0800)]
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
Fabrice Di Meglio [Thu, 6 Mar 2014 00:27:40 +0000 (00:27 +0000)]
Merge "Fix bug #
13322036 stability-sys: Java crash in com.android.settings: android.database.sqlite.SQLiteException: malformed MATCH expression: [ avs- /y@ggmd"*] (code 1)"
Fabrice Di Meglio [Thu, 6 Mar 2014 00:24:35 +0000 (16:24 -0800)]
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
Baligh Uddin [Wed, 5 Mar 2014 21:07:50 +0000 (13:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id18f29d4a6ce3cc7fe2abc64768d00035b91a4e3
Auto-generated-cl: translation import
Tom O'Neill [Tue, 4 Mar 2014 18:59:29 +0000 (10:59 -0800)]
Remove some usages of deprecated location APIs
Bug:
13302202
Change-Id: I916568d2b310eaf9a8b30da9a9980344aaf76c21
John Spurlock [Wed, 5 Mar 2014 00:05:46 +0000 (19:05 -0500)]
Update zen mode config view to reflect new default.
Change-Id: I5084d440a351dd2be1171139107220cab86718f6
Fabrice Di Meglio [Tue, 4 Mar 2014 20:57:51 +0000 (20:57 +0000)]
Merge "Fix bug #
13300024 Settings app crashes on changing device orientation"
Fabrice Di Meglio [Tue, 4 Mar 2014 20:53:59 +0000 (12:53 -0800)]
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
Yuhao Zheng [Tue, 4 Mar 2014 17:43:46 +0000 (17:43 +0000)]
Merge "Make Setting UI use system proxy validity check"
Baligh Uddin [Tue, 4 Mar 2014 17:11:04 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Wei Wang [Mon, 3 Mar 2014 22:58:54 +0000 (14:58 -0800)]
Change bluetooth off display message.
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
Tom O'Neill [Mon, 3 Mar 2014 23:24:56 +0000 (23:24 +0000)]
Merge "Remove unused string"
Fabrice Di Meglio [Tue, 4 Feb 2014 02:12:25 +0000 (18:12 -0800)]
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
Fabrice Di Meglio [Mon, 3 Mar 2014 21:55:01 +0000 (21:55 +0000)]
Merge "Fix Drawer selection and initial Header"
Tom O'Neill [Mon, 3 Mar 2014 21:16:53 +0000 (13:16 -0800)]
Remove unused string
- Usage removed in
https://googleplex-android-review.googlesource.com/427312
- Bug:
13279850
Change-Id: I3c10d5e15a208b877bd0ef4627eb5cf2f2b61fa6
Baligh Uddin [Mon, 3 Mar 2014 20:37:26 +0000 (12:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic375ce25988325868ba3beb2c4f2e3b5e750063b
Auto-generated-cl: translation import
Fabrice Di Meglio [Mon, 3 Mar 2014 19:34:18 +0000 (11:34 -0800)]
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
Yuhao Zheng [Sat, 1 Mar 2014 01:09:43 +0000 (17:09 -0800)]
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
Wei Wang [Fri, 28 Feb 2014 00:28:34 +0000 (16:28 -0800)]
Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This reverts commit
eb56b9ccb8fa70a6c567d0bcd02f821e4de4bf7b.
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
Tom O'Neill [Mon, 3 Mar 2014 18:49:42 +0000 (18:49 +0000)]
Merge "Ignore any summary provided for injected settings"
Tom O'Neill [Mon, 3 Mar 2014 18:17:52 +0000 (10:17 -0800)]
Ignore any summary provided for injected settings
Bug:
13279850
Change-Id: I1e5a39c9542b3121835f61cd0ce82612c7948cd7
Fabrice Di Meglio [Mon, 3 Mar 2014 18:01:18 +0000 (18:01 +0000)]
Merge "Fix Fragment BackStack and Titles"
Chris Wren [Mon, 3 Mar 2014 15:26:01 +0000 (15:26 +0000)]
Merge "rename heads up global setting: app part"
Matthew Xie [Sat, 1 Mar 2014 22:20:32 +0000 (22:20 +0000)]
Merge "Update context on resume calls for BluetoothAdvertisingEnabler and BluetoothEnabler"
Chris Wren [Sat, 1 Mar 2014 15:34:19 +0000 (10:34 -0500)]
rename heads up global setting: app part
Bug:
13208692
Depends-On: Ia020e4d63552ab4b8cbb8a37622c36776800a790
Change-Id: I73755ea40d7e741e9036a245bd9c70c976aeef1a
Chris Wren [Sat, 1 Mar 2014 00:06:54 +0000 (00:06 +0000)]
Merge "add a setting for the heads up: app part"
John Spurlock [Fri, 28 Feb 2014 23:04:28 +0000 (23:04 +0000)]
Merge "Zen mode configuration panel. (packages/apps/Settings)"
John Spurlock [Thu, 27 Feb 2014 23:01:20 +0000 (18:01 -0500)]
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
Chris Wren [Fri, 28 Feb 2014 21:16:59 +0000 (16:16 -0500)]
add a setting for the heads up: app part
Bug:
13208692
Depends-On: I6847f7a5f275aee2f608de0237dab0e45c39b33f
Change-Id: Ia410a473492aa7637449ba5a5dc068f98618ad03
rich cannings [Fri, 28 Feb 2014 17:56:53 +0000 (09:56 -0800)]
Legal and strings approved verify apps summary
Change-Id: Iec9dd6ec7eb4b90862021fc870235848723a2e31
Dianne Hackborn [Fri, 28 Feb 2014 02:03:15 +0000 (02:03 +0000)]
Merge "Show new radio active times."
Fabrice Di Meglio [Thu, 27 Feb 2014 23:51:46 +0000 (15:51 -0800)]
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
Matthew Xie [Thu, 27 Feb 2014 21:46:26 +0000 (21:46 +0000)]
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
Matthew Xie [Thu, 27 Feb 2014 21:42:47 +0000 (21:42 +0000)]
am
b1140053: am
85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"
* commit '
b1140053057ab62cfe1bd766baa01a979739a407':
HTML injection fix for bluetooth pairing, issue 65946
Matthew Xie [Thu, 27 Feb 2014 21:39:34 +0000 (21:39 +0000)]
am
85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"
* commit '
85fb88ee10c6bb901d30e50038b4a86252ff8c68':
HTML injection fix for bluetooth pairing, issue 65946
Matthew Xie [Thu, 27 Feb 2014 21:32:50 +0000 (21:32 +0000)]
Merge "HTML injection fix for bluetooth pairing, issue 65946"
John Spurlock [Thu, 27 Feb 2014 20:37:13 +0000 (15:37 -0500)]
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
Rob Fletcher [Tue, 25 Feb 2014 18:16:12 +0000 (18:16 +0000)]
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
Narayan Kamath [Thu, 27 Feb 2014 12:09:00 +0000 (12:09 +0000)]
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."
Narayan Kamath [Thu, 27 Feb 2014 12:06:36 +0000 (12:06 +0000)]
am
729c83a4: am
7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
* commit '
729c83a4f8d7bdd02de2c9c3be1243985b042d5d':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
Narayan Kamath [Thu, 27 Feb 2014 12:05:07 +0000 (12:05 +0000)]
am
7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
* commit '
7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
Narayan Kamath [Thu, 27 Feb 2014 12:00:22 +0000 (12:00 +0000)]
Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
Narayan Kamath [Thu, 27 Feb 2014 12:00:08 +0000 (12:00 +0000)]
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
This reverts commit
d5d9d373619de3437593763578854a83f5539306.
Change-Id: I76eeb6f95a4cbbd241db1fb90528b4d91ddf7707
Narayan Kamath [Thu, 27 Feb 2014 11:53:32 +0000 (11:53 +0000)]
am
a5fbf748: am
ef3a0be9: am
14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
* commit '
a5fbf748c1c92e5dd7ec69de71ed9bf371c11d19':
Set 24 hour pref. with ACTION_TIME_CHANGED.
Narayan Kamath [Thu, 27 Feb 2014 11:50:09 +0000 (11:50 +0000)]
am
ef3a0be9: am
14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
* commit '
ef3a0be922618334645b7f9b5e3ab719f3578b92':
Set 24 hour pref. with ACTION_TIME_CHANGED.
Narayan Kamath [Thu, 27 Feb 2014 11:46:48 +0000 (11:46 +0000)]
am
14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
* commit '
14b0da749c73c1e0201adee1b398a1955b7d624e':
Set 24 hour pref. with ACTION_TIME_CHANGED.
Narayan Kamath [Thu, 27 Feb 2014 11:42:10 +0000 (11:42 +0000)]
Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."