OSDN Git Service
Fabrice Di Meglio [Thu, 3 Apr 2014 02:37:39 +0000 (19:37 -0700)]
Add indexing for SwitchPreferences
- now support the SwitchPreferences and save the "switchOn" and "switchOff"
attributes
- update Index database schema (and increment its version)
- fix an issue with some previous schema not rebuilt
Change-Id: I9cd48c666525f19474ef9bd5746d61b589058063
Fabrice Di Meglio [Thu, 3 Apr 2014 02:05:45 +0000 (19:05 -0700)]
Add indexing for ListPreferences
- now support ListPreferences and save the "entries" attribute
- update Index database schema (and increment its version)
- do some clever stuff when showing Search results: if there is
a "$s" or "%s" in the summary (replacement strings), just use
the entries instead
Change-Id: If36595c3816706b6349faff7d3c2e725d3ea33f4
Fabrice Di Meglio [Thu, 3 Apr 2014 00:07:36 +0000 (17:07 -0700)]
Add indexing for Storage preferences
- implement the contract for SEARCH_INDEX_DATA_PROVIDER
Change-Id: I131e9176c47ccd697d05961b09546ba0e51059f7
Fabrice Di Meglio [Wed, 2 Apr 2014 22:43:39 +0000 (15:43 -0700)]
Blow up the Settings Search Index database if there is a Database downgrade detected
- use the onDowngrade(...) callback for blowing away the Search Index database and
recompute the Index.
Change-Id: I137b22e710dd3205063cf8ce239105b2f1c5278b
Fabrice Di Meglio [Tue, 1 Apr 2014 21:30:07 +0000 (14:30 -0700)]
Add indexing for Limited Interruptions (notifications) preferences
- implement the contract for SEARCH_INDEX_DATA_PROVIDER
- some code styling too
Change-Id: I106d1d9493eb945ea71e500acd43a1fc6096bb1f
Fabrice Di Meglio [Tue, 1 Apr 2014 20:25:16 +0000 (20:25 +0000)]
Merge "Add indexing for Notifications preferences"
Fabrice Di Meglio [Tue, 1 Apr 2014 02:46:42 +0000 (19:46 -0700)]
Add indexing for Notifications preferences
- also add indexing of CheckBoxPreferences
- also some code cleaning
Change-Id: I2943caaec3d64fb2a6be85168454fc76fe572afe
Baligh Uddin [Tue, 1 Apr 2014 01:25:38 +0000 (01:25 +0000)]
am
b89c4d71: (-s ours) am
cf743762: (-s ours) am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
b89c4d713bd33072961ace7743d391ed6339d410':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Tue, 1 Apr 2014 01:21:22 +0000 (01:21 +0000)]
Merge "Fix bug #
13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)."
Fabrice Di Meglio [Mon, 31 Mar 2014 23:52:06 +0000 (16:52 -0700)]
Fix bug #
13727850 Input values are not visible when setting up the lockscreen...
...security(PIN/Passwor/Pattern).
- remove hardcoded colors...
- define a text appearance style for the password / pin
Change-Id: I425a2daa016cb782f18de320b5696d076f576600
Baligh Uddin [Tue, 1 Apr 2014 00:24:35 +0000 (00:24 +0000)]
am
b3545a54: (-s ours) am
518a5037: (-s ours) Import translations. DO NOT MERGE
* commit '
b3545a548fe336024dae011ac1c4e643d4f4b114':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:21:31 +0000 (00:21 +0000)]
am
cf743762: (-s ours) am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
cf743762611ceb918aabee179ef10f81ccc90aaf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:15:49 +0000 (00:15 +0000)]
am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
88adaa72a385c3199787ecd3dae826f25d38572d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:09:19 +0000 (00:09 +0000)]
am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
112916b59634a86195880a1368d8d60a86f33188':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:08:46 +0000 (00:08 +0000)]
am
518a5037: (-s ours) Import translations. DO NOT MERGE
* commit '
518a503740bcb900fe8a69c86f5826466f99ee6e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 22:15:05 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 31 Mar 2014 21:47:58 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40361b20546a4fa949b75623315040f0d32127fa
Auto-generated-cl: translation import
Baligh Uddin [Mon, 31 Mar 2014 21:42:20 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 31 Mar 2014 21:40:25 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
Adrian Roos [Mon, 24 Mar 2014 20:21:51 +0000 (21:21 +0100)]
Add initial trust agent settings
Adds a first version of the trust agent settings
under Security -> Device Administration -> Trust Agents.
Change-Id: I2e2dc41208d13cc1b11bb21d427c6f86053a3640
John Spurlock [Mon, 31 Mar 2014 16:02:35 +0000 (12:02 -0400)]
Zen mode settings update.
- Fix master switch placement, hide search option.
- New text-based design for bucket configs.
- Automatically turn on = Never
- Still read-only.
Bug:
13670014
Change-Id: I33e7614515cc4ce1ca957d922b844d4865e35c9a
John Spurlock [Mon, 31 Mar 2014 14:16:04 +0000 (10:16 -0400)]
Fix NPE in notification settings.
Show/hide the apps category safely every time.
Default apps category to hidden to avoid startup blip.
Change-Id: I4c18c57754e5d0a6a73e7271844ff71c0a66ad8d
Fabrice Di Meglio [Sat, 29 Mar 2014 01:49:03 +0000 (01:49 +0000)]
Merge "Go Quantum Go!"
Fabrice Di Meglio [Sat, 29 Mar 2014 01:48:05 +0000 (18:48 -0700)]
Go Quantum Go!
- use the Quantum Theme light version
Change-Id: I81c40813b8fb59286a370bde33076cdcd73390e5
Lajos Molnar [Fri, 28 Mar 2014 23:15:41 +0000 (23:15 +0000)]
Merge "Add temporary developer setting to use NuPlayer as default media player"
Fabrice Di Meglio [Fri, 28 Mar 2014 23:08:20 +0000 (23:08 +0000)]
Merge "Settings - update for new UI (no more Drawer)"
Fabrice Di Meglio [Sat, 22 Mar 2014 02:24:43 +0000 (19:24 -0700)]
Settings - update for new UI (no more Drawer)
- follow the UX spec by no more using a Drawer
- the Dashboard is now a Fragment that contains the list of Headers
- the search results are also put into a Fragment that is replacing
the initial one (Dashboard or other) when expanding the SearchView
- use a SearchView for query input
- when tapping on a Header or a Search Result, re-launch Settings as
an Activity so that we are benefiting from the Activity stack for
UP affordance and BACK button
- manage UP affordance to show it only when needed
- move some Actions to the Menu in the ActionBar for allowing space
to the Search action and removing some clutter
- fix an issue with the Index and WiFiEnabler and their cached Context
that was not updated when there was a Configuration change
- simplify the SettingsActivity code by extracting some inner classes
Change-Id: I50b5f77bb44a7fade1886114dbbc820609a5e63d
John Spurlock [Fri, 28 Mar 2014 19:07:37 +0000 (19:07 +0000)]
am
ce1b22cf: (-s ours) am
c4231382: DO NOT MERGE Settings: Implement new required method.
* commit '
ce1b22cf66b853ba834bf963ab8a6a45e829fd15':
DO NOT MERGE Settings: Implement new required method.
John Spurlock [Fri, 28 Mar 2014 19:01:12 +0000 (19:01 +0000)]
am
c4231382: DO NOT MERGE Settings: Implement new required method.
* commit '
c423138247857312a4ac6ad32cb482868315bd61':
DO NOT MERGE Settings: Implement new required method.
Dan Sandler [Fri, 28 Mar 2014 18:51:04 +0000 (18:51 +0000)]
Merge "List apps that advertise notification settings."
Dan Sandler [Wed, 26 Mar 2014 23:09:21 +0000 (19:09 -0400)]
List apps that advertise notification settings.
Apps that have a CATEGORY_NOTIFICATION_PREFERENCES +
CATEGORY_DEFAULT activity will be listed in notification
settings, with a convenient link to that activity so the
user can tweak those settings.
Change-Id: Idc97b2aee3f070225822ebee1ecbeab79e7b9c2d
Lajos Molnar [Fri, 28 Mar 2014 16:48:58 +0000 (09:48 -0700)]
Add temporary developer setting to use NuPlayer as default media player
Bug:
11784824
Change-Id: Id42cc40d08ada06ec9e57e24473f7f833bc90dca
John Spurlock [Fri, 28 Mar 2014 13:41:30 +0000 (09:41 -0400)]
DO NOT MERGE Settings: Implement new required method.
Only required since it uses the non-public version
of the api.
Bug:
13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa
John Spurlock [Fri, 28 Mar 2014 13:09:50 +0000 (13:09 +0000)]
Merge "Add switch to zen mode settings preference page."
John Spurlock [Fri, 28 Mar 2014 13:08:59 +0000 (13:08 +0000)]
Merge "Settings: Implement new required method."
Baligh Uddin [Thu, 27 Mar 2014 23:17:00 +0000 (23:17 +0000)]
am
1df63dd8: (-s ours) am
584ac4c5: (-s ours) am
f39672bf: (-s ours) am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
1df63dd8afa947b9a0e1b1295d5bf042cb2aec3f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 23:10:42 +0000 (23:10 +0000)]
am
584ac4c5: (-s ours) am
f39672bf: (-s ours) am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
584ac4c525d45dfdc61f3f9db746582622e2ab5b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 23:05:03 +0000 (23:05 +0000)]
am
f39672bf: (-s ours) am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
f39672bfac77a604a3a04484f7d88adc4ecf9c66':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 22:26:39 +0000 (22:26 +0000)]
am
5c5bfbb0: (-s ours) am
1dc01d10: (-s ours) Import translations. DO NOT MERGE
* commit '
5c5bfbb048d5b92b095e974496a48cd3b7ff8baf':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 22:22:05 +0000 (22:22 +0000)]
am
1dc01d10: (-s ours) Import translations. DO NOT MERGE
* commit '
1dc01d10ddb19355dc21b6e677afcf33aa460136':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 22:22:03 +0000 (22:22 +0000)]
am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
3a9b49f975df7c53e86dd795e21f904442c22a4a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 21:48:36 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Nicholas Sauer [Thu, 27 Mar 2014 21:37:19 +0000 (21:37 +0000)]
Merge "Skip bluetooth device iteration if LocalBluetoothManager is null"
Nicholas Sauer [Wed, 26 Mar 2014 17:23:11 +0000 (10:23 -0700)]
Skip bluetooth device iteration if LocalBluetoothManager is null
bug:
13653239
Change-Id: I163c47b626825b2f83bb63d9f6900216ce44ae41
John Spurlock [Thu, 27 Mar 2014 14:21:04 +0000 (10:21 -0400)]
Add switch to zen mode settings preference page.
Bug:
13670014
Change-Id: Id45841818e2fe8f57b5db47df3b0add06be6967a
Amith Yamasani [Wed, 26 Mar 2014 23:27:09 +0000 (23:27 +0000)]
Merge "Don't allow user creation on phones via Settings search"
Amith Yamasani [Wed, 26 Mar 2014 21:46:47 +0000 (14:46 -0700)]
Don't allow user creation on phones via Settings search
This screen was blocked from appearing in the main Settings list, but
search now exposes it.
Disable content on the Users screen if multiple users are not supported
on the device. This is a temporary fix until Settings search does the
right thing.
Bug:
13631986
Change-Id: Icc61d3e9ce4e405d0cf8841af538216be59fac26
Baligh Uddin [Wed, 26 Mar 2014 21:17:52 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: If8a371ad883f5b1d685b551f781b7dd6c2698eba
Auto-generated-cl: translation import
Baligh Uddin [Wed, 26 Mar 2014 21:11:08 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09b061fd0c7dd8e4ea00e6627af4e8dfa0d01200
Auto-generated-cl: translation import
Baligh Uddin [Wed, 26 Mar 2014 21:08:55 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import
John Spurlock [Wed, 26 Mar 2014 16:56:43 +0000 (12:56 -0400)]
Update zen mode settings.
Change-Id: I61b62dec9ddeb9314130151e397a65aed52e1af1
Baligh Uddin [Tue, 25 Mar 2014 21:22:46 +0000 (21:22 +0000)]
am
ea5d0040: (-s ours) am
a2ea9ac6: (-s ours) am
5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ea5d00400b07f918d4d5761dfe4c92fd81cb1992':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 21:20:59 +0000 (21:20 +0000)]
am
4641bf95: (-s ours) am
bbcd64cb: (-s ours) am
7bad0786: (-s ours) am
b86dff84: (-s ours) am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
4641bf95bccfb94585ff50f72174fd5160a764dc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 19:13:08 +0000 (19:13 +0000)]
am
a2ea9ac6: (-s ours) am
5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
a2ea9ac68fba4168566a87223f3f557bed33a2ac':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 19:06:01 +0000 (19:06 +0000)]
am
5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
5f4696f8e00731d2825ec6fc7d24c020f3e75f73':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 19:03:39 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 25 Mar 2014 19:01:04 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 25 Mar 2014 17:22:42 +0000 (17:22 +0000)]
am
bbcd64cb: (-s ours) am
7bad0786: (-s ours) am
b86dff84: (-s ours) am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
bbcd64cb8b126298528264f781df2a996ff29ab6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 17:07:48 +0000 (17:07 +0000)]
am
7bad0786: (-s ours) am
b86dff84: (-s ours) am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
7bad0786ec63fc513a195579417901722c8689db':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 17:02:02 +0000 (17:02 +0000)]
am
b86dff84: (-s ours) am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
b86dff8480e486847148f9651bc830b762d307ee':
Import translations. DO NOT MERGE
John Spurlock [Mon, 24 Mar 2014 22:02:43 +0000 (18:02 -0400)]
Settings: Implement new required method.
Only required since it uses the non-public version
of the api.
Bug:
13562828
Change-Id: I63230962ac886465b3a1a2721e65b1d3fac33707
Baligh Uddin [Tue, 25 Mar 2014 16:54:48 +0000 (16:54 +0000)]
am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 20:07:04 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: If05b5e4e9f0da7a811dcbe2d3837326310338438
Auto-generated-cl: translation import
Baligh Uddin [Mon, 24 Mar 2014 20:01:09 +0000 (13:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75bc6fa1afafd7abc9a8d0af3e8825c053225807
Auto-generated-cl: translation import
Baligh Uddin [Mon, 24 Mar 2014 19:59:14 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
Dianne Hackborn [Fri, 21 Mar 2014 21:03:15 +0000 (14:03 -0700)]
Switch to new "cpu running" state for showing wake time in chart.
Change-Id: I69b27c506e057353d9ee32f5d80e3077c7eba207
Fabrice Di Meglio [Fri, 21 Mar 2014 20:50:25 +0000 (13:50 -0700)]
Use SearchIndexableData enable state for WiFi Settings
- same as for Bluetooth
- now the remembered WiFi networks names can be indexed when
WiFi is turned on
Change-Id: I904ce6a425c21ee07ce3ee8fdc0cd71ab5a18d12
Fabrice Di Meglio [Fri, 21 Mar 2014 02:52:29 +0000 (19:52 -0700)]
Add dynamic Preferences indexing (part 2)
- change the Index SQL model. Add a new "enabled" column.
- use that column for issuing a more restrictive search query
- change the SearchIndexProvider API to pass the "enable" state
- apply it to Bluetooth settings
- refactor the list of indexable resources (SearchIndexableResources)
Change-Id: Ic900fb27cb12a285a80d953aa1aa88f0070cd986
Fabrice Di Meglio [Thu, 20 Mar 2014 21:13:03 +0000 (21:13 +0000)]
Merge "Add indexing for cached Bluetooth (BT) paired devices"
Baligh Uddin [Thu, 20 Mar 2014 21:05:47 +0000 (21:05 +0000)]
am
3f114d6f: (-s ours) am
31a72b07: (-s ours) am
e3a0b402: (-s ours) am
2e71c1df: (-s ours) am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
3f114d6f06a8479d78ea1cf095bd3ef58fe430b1':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Thu, 13 Mar 2014 00:12:26 +0000 (17:12 -0700)]
Add indexing for cached Bluetooth (BT) paired devices
- comply to the SEARCH_INDEX_DATA_PROVIDER
- add to the Index the name of previously paired BT devices
(this will work for now only and only if BT has been on during
the indexing)
Change-Id: I00065db0f4e9657cca3578a2fafa0ec39cfaa432
Wei Wang [Thu, 20 Mar 2014 19:30:28 +0000 (19:30 +0000)]
am
826eaa18: (-s ours) am
a95228ff: am
41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
* commit '
826eaa18b2cd8a6c22f22037f43cd485a3df3794':
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
Fabrice Di Meglio [Thu, 20 Mar 2014 19:26:55 +0000 (19:26 +0000)]
Merge "Fix bug #
13563247 Settings crash on launch in secondary user"
Fabrice Di Meglio [Thu, 20 Mar 2014 19:24:57 +0000 (12:24 -0700)]
Fix bug #
13563247 Settings crash on launch in secondary user
- add missing permission android.permission.READ_SEARCH_INDEXABLES
Change-Id: I577f8bfebf5e29e7954ca36cf65e981464aa5924
Baligh Uddin [Thu, 20 Mar 2014 19:12:59 +0000 (19:12 +0000)]
am
31a72b07: (-s ours) am
e3a0b402: (-s ours) am
2e71c1df: (-s ours) am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
31a72b0769d12cd07f453c7f50309d0729d7734e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 19:09:05 +0000 (19:09 +0000)]
am
e3a0b402: (-s ours) am
2e71c1df: (-s ours) am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
e3a0b402c3d9163b5dff884c44d3a5f2a86e80aa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 19:02:30 +0000 (19:02 +0000)]
am
2e71c1df: (-s ours) am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:41:54 +0000 (18:41 +0000)]
am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
947e8995856a66d05bfb614edf00dd5edfecc4ba':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:38:24 +0000 (18:38 +0000)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Thu, 20 Mar 2014 16:44:50 +0000 (16:44 +0000)]
Merge "Fix to show correct percentage in battery details."
Wei Wang [Thu, 20 Mar 2014 16:29:09 +0000 (16:29 +0000)]
am
a95228ff: am
41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
* commit '
a95228ff5bca8620e5a866056e13c15d344c2a8c':
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
Wei Wang [Thu, 20 Mar 2014 16:24:12 +0000 (16:24 +0000)]
am
41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
* commit '
41f5437def4b97581d67b5636ca2dba10f8eb385':
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
Paul Lawrence [Thu, 20 Mar 2014 13:33:52 +0000 (13:33 +0000)]
Merge "Handle pattern cooldown correctly"
Wei Wang [Fri, 28 Feb 2014 00:28:34 +0000 (16:28 -0800)]
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This is cherry pick from master/klp-dev changes.
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
Conflicts:
src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
Fabrice Di Meglio [Thu, 20 Mar 2014 01:15:08 +0000 (01:15 +0000)]
Merge "Add external Preferences indexing"
Dianne Hackborn [Wed, 19 Mar 2014 23:57:33 +0000 (16:57 -0700)]
Fix to show correct percentage in battery details.
Change-Id: I5745ca4dc6330b044e02e94630cf3d2c3e1266af
Fabrice Di Meglio [Thu, 13 Mar 2014 02:24:43 +0000 (19:24 -0700)]
Add external Preferences indexing
- define SettingsSearchIndexablesProvider as an internal
SearchIndexablesProvider
- protect access thru using android.permission.READ_SEARCH_INDEXABLES
- update WallpaperTypeSettings and WifiSettings for taking care of
the new model
- update the Dashboard for taking care about external Icons for the
search result
- update sqlite model/version for taking care about Intents
(enable launching external applications for showing the settings)
Change-Id: I2e38599327e6480f1754f52666becce0884cee9d
Baligh Uddin [Wed, 19 Mar 2014 20:17:30 +0000 (13:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I798e5e572d16aef5e4940923b74bdc25d2ef99b1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 19 Mar 2014 20:10:41 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
Amith Yamasani [Wed, 19 Mar 2014 19:47:33 +0000 (19:47 +0000)]
Merge "Allow spell checking in owner info field"
Amith Yamasani [Wed, 19 Mar 2014 19:32:54 +0000 (12:32 -0700)]
Allow spell checking in owner info field
Bug:
10231042
Change-Id: Ifbf8aa92de9fd92a16e3b292169b1cf7b4d1eb4f
Tom O'Neill [Wed, 19 Mar 2014 17:38:05 +0000 (10:38 -0700)]
Injected settings start new task
- Bug:
13534214
Change-Id: I10b47f58651166a58a86efe8da2979e8f9a2a5cb
Russell Brenner [Wed, 19 Mar 2014 15:57:43 +0000 (15:57 +0000)]
Merge "Improve support for default theme of WifiSetupActivity"
Russell Brenner [Tue, 18 Mar 2014 22:17:35 +0000 (15:17 -0700)]
Improve support for default theme of WifiSetupActivity
Default theme can be either dark or light, depending on the app theme
in the manifest. When processing extras, the default was always
assumed to be dark.
Change-Id: I4598ad25ffa69b63fa91cab8b07931ba37ba7676
Geoff Mendal [Mon, 17 Mar 2014 23:32:49 +0000 (23:32 +0000)]
am
97bce9d0: (-s ours) am
26fa5188: (-s ours) am
27259b53: (-s ours) am
c8131cb9: (-s ours) am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
97bce9d08711dc30857dc63c8cf2269c13e17bb8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:55:49 +0000 (20:55 +0000)]
am
26fa5188: (-s ours) am
27259b53: (-s ours) am
c8131cb9: (-s ours) am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
26fa5188c79836a328b28bdeac65cd7fa8894bd4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:52:13 +0000 (20:52 +0000)]
am
27259b53: (-s ours) am
c8131cb9: (-s ours) am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
27259b53e6db8781ef7aea614298d50bf26d30e4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:46:32 +0000 (20:46 +0000)]
am
c8131cb9: (-s ours) am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:34:20 +0000 (20:34 +0000)]
am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 19:48:05 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31c08213e25b11114c2ec5d4689815f83ce26270
Auto-generated-cl: translation import