OSDN Git Service
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
Geoff Mendal [Mon, 17 Mar 2014 19:42:54 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
Felipe Leme [Fri, 14 Mar 2014 22:42:05 +0000 (22:42 +0000)]
Merge "Displays frequency on connected WiFi network info. Bug:
12767819"
David Braun [Fri, 14 Mar 2014 17:54:13 +0000 (17:54 +0000)]
am
177c876f: am
ca95017f: am
c0737638: am
63ac6a06: am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
177c876fed5511dadc02544040dcdfa24435d1b6':
Add string parameter order to default SMS dialog text
Baligh Uddin [Fri, 14 Mar 2014 17:54:13 +0000 (17:54 +0000)]
am
c48923ed: (-s ours) am
c5ff40fe: (-s ours) am
1badeea1: (-s ours) am
25503480: (-s ours) am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
c48923edb575e99f5d0d853939d6680a03221ce9':
Import translations. DO NOT MERGE
David Braun [Fri, 14 Mar 2014 16:36:28 +0000 (16:36 +0000)]
am
ca95017f: am
c0737638: am
63ac6a06: am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
ca95017fa315f6ed9ad2c41adc38145a4f4f88b8':
Add string parameter order to default SMS dialog text
Baligh Uddin [Fri, 14 Mar 2014 16:36:28 +0000 (16:36 +0000)]
am
c5ff40fe: (-s ours) am
1badeea1: (-s ours) am
25503480: (-s ours) am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
c5ff40fea65cb2618ef7449136a14e291f2a6ee7':
Import translations. DO NOT MERGE
David Braun [Fri, 14 Mar 2014 16:32:41 +0000 (16:32 +0000)]
am
c0737638: am
63ac6a06: am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
c07376380f566e241dd4ba85a23ff791bdea1524':
Add string parameter order to default SMS dialog text
Baligh Uddin [Fri, 14 Mar 2014 16:32:40 +0000 (16:32 +0000)]
am
1badeea1: (-s ours) am
25503480: (-s ours) am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
1badeea19584849f4e324d658a0ce160e6707388':
Import translations. DO NOT MERGE
David Braun [Fri, 14 Mar 2014 16:28:00 +0000 (16:28 +0000)]
am
63ac6a06: am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
63ac6a06efd39078b3fc066896fc7ea003ab34ce':
Add string parameter order to default SMS dialog text
Baligh Uddin [Fri, 14 Mar 2014 16:27:48 +0000 (16:27 +0000)]
am
25503480: (-s ours) am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
255034803c3301cbf93ce64a2740af2abe8dc1f9':
Import translations. DO NOT MERGE
Paul Lawrence [Fri, 14 Mar 2014 16:20:24 +0000 (09:20 -0700)]
Handle pattern cooldown correctly
We need to disable pattern control when in cooldown. We also need
to hide the back button completely in pattern mode.
Bug:
13329798
Change-Id: Idefea60d95db1810d340c69cc730a286011363db
Paul Lawrence [Fri, 14 Mar 2014 14:38:53 +0000 (14:38 +0000)]
Merge "Don't show IME on pattern"
Baligh Uddin [Fri, 14 Mar 2014 10:02:46 +0000 (10:02 +0000)]
am
4323f74a: (-s ours) am
5969801c: (-s ours) am
a60df014: (-s ours) am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4323f74aa197701b7b1ea8c45993f57563208810':
Import translations. DO NOT MERGE
Alan Viverette [Fri, 14 Mar 2014 10:02:45 +0000 (10:02 +0000)]
am
0fa90474: (-s ours) am
3782a3a6: am
42972075: am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
0fa90474e0ee085051d9ba155705b7f5d3bc7bfa':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Fri, 14 Mar 2014 10:02:44 +0000 (10:02 +0000)]
am
305013b1: (-s ours) am
b4a50745: am
c736f794: am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
305013b1638e72712464f122435ff350aef5a6be':
DO NOT MERGE Remove extra fragment in captioning preferences
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 23:12:10 +0000 (23:12 +0000)]
am
7a5911a9: am
375545e2: am
6829c48c: Merge "Fix F/C in TTS settings"
* commit '
7a5911a96d158567bac1e892aee813af1b563a46':
Fix F/C in TTS settings
Fabrice Di Meglio [Thu, 13 Mar 2014 21:17:21 +0000 (21:17 +0000)]
Merge "Fix bug #
13440372 More option is displayed with Email/Gmail icon after... scrolling through settings options"
Fabrice Di Meglio [Thu, 13 Mar 2014 19:49:01 +0000 (12:49 -0700)]
Fix bug #
13440372 More option is displayed with Email/Gmail icon after...
scrolling through settings options
- force the image and background to null when needed in the Adapter
Change-Id: If4c1769dcd1651b683a34001dcd922c6554252c0
Paul Lawrence [Thu, 13 Mar 2014 21:05:48 +0000 (14:05 -0700)]
Don't show IME on pattern
Bug:
13327729
Change-Id: Ie83dda98558b66c824c15975310a8fb1835e900f
David Braun [Thu, 13 Mar 2014 18:30:11 +0000 (18:30 +0000)]
am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
Add string parameter order to default SMS dialog text
David Braun [Thu, 13 Mar 2014 18:20:48 +0000 (11:20 -0700)]
Add string parameter order to default SMS dialog text
Bug:
13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
Baligh Uddin [Thu, 13 Mar 2014 18:08:56 +0000 (18:08 +0000)]
am
5969801c: (-s ours) am
a60df014: (-s ours) am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5969801cc119ce58c7f18b1a9cbcc46c8b7ad232':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:08:55 +0000 (18:08 +0000)]
am
3782a3a6: am
42972075: am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
3782a3a6a1a1d22e553cf04231d76103aaf36a7b':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 18:08:54 +0000 (18:08 +0000)]
am
b4a50745: am
c736f794: am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
b4a50745f2833cfb73c05586fa9f9b63c0dc1629':
DO NOT MERGE Remove extra fragment in captioning preferences
Baligh Uddin [Thu, 13 Mar 2014 18:02:47 +0000 (18:02 +0000)]
am
a60df014: (-s ours) am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a60df014e27d9cd57396655b98922394ff7d73bb':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:02:19 +0000 (18:02 +0000)]
am
42972075: am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
429720754d85e1b13bc9001adaa23a0b0db04b61':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 18:02:18 +0000 (18:02 +0000)]
am
c736f794: am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
c736f794ac38b832b5ffde28502580a9b20b722b':
DO NOT MERGE Remove extra fragment in captioning preferences
Baligh Uddin [Thu, 13 Mar 2014 17:19:21 +0000 (17:19 +0000)]
am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
846f036ef15a2bea6c522e5b75b351b28c29953c':
Import translations. DO NOT MERGE
Dianne Hackborn [Thu, 13 Mar 2014 17:04:58 +0000 (17:04 +0000)]
Merge "Bat stats: misc, percents are of battery drain."
Dianne Hackborn [Wed, 12 Mar 2014 20:27:29 +0000 (13:27 -0700)]
Bat stats: misc, percents are of battery drain.
Change-Id: I6f1fb6ff33f524fe76d519a6194fad67559193bd
Baligh Uddin [Thu, 13 Mar 2014 16:40:31 +0000 (16:40 +0000)]
am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:37:46 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 15:35:41 +0000 (15:35 +0000)]
am
375545e2: am
6829c48c: Merge "Fix F/C in TTS settings"
* commit '
375545e2fe6da2c2ccae7239f444a92004213018':
Fix F/C in TTS settings
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 15:32:48 +0000 (15:32 +0000)]
am
6829c48c: Merge "Fix F/C in TTS settings"
* commit '
6829c48c36fceebb46989f8ee25c369fa5f7adeb':
Fix F/C in TTS settings
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 15:26:47 +0000 (15:26 +0000)]
Merge "Fix F/C in TTS settings"
Alan Viverette [Thu, 13 Mar 2014 10:01:45 +0000 (10:01 +0000)]
am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
0100a310d8184baf9576925d160f8af09aa93b10':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 10:01:42 +0000 (10:01 +0000)]
am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
a74da813ec622822c8bb8b4524439c81e8b90dfa':
DO NOT MERGE Remove extra fragment in captioning preferences
Shuhrat Dehkanov [Wed, 12 Mar 2014 13:57:08 +0000 (22:57 +0900)]
Fix F/C in TTS settings
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.
Please see https://code.google.com/p/android/issues/detail?id=63122
Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
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"
Baligh Uddin [Wed, 12 Mar 2014 19:08:43 +0000 (12:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I740417ae9fb2163d81b85ec337d2f1687ebb1a5f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Mar 2014 19:02:29 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
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
Felipe Leme [Mon, 3 Feb 2014 19:29:02 +0000 (11:29 -0800)]
Displays frequency on connected WiFi network info.
Bug:
12767819
Change-Id: Ia71b28b1dd77bdabc53a3e91bd54375bdaebfe4a
Baligh Uddin [Tue, 11 Mar 2014 17:41:25 +0000 (17:41 +0000)]
am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
14b82fd73f59f51dffee9562057ab747f12134d3':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Mar 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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
Alan Viverette [Tue, 11 Mar 2014 02:15:28 +0000 (02:15 +0000)]
am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Tue, 11 Mar 2014 02:15:27 +0000 (02:15 +0000)]
am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
d43d5becb359cfdd5e30f691724739ab216011f0':
DO NOT MERGE Remove extra fragment in captioning preferences
Alan Viverette [Tue, 11 Mar 2014 02:11:52 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
OSDN Git Service
