OSDN Git Service
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 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
Alan Viverette [Tue, 11 Mar 2014 02:11:41 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
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
Baligh Uddin [Mon, 10 Mar 2014 22:28:38 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
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
Alan Viverette [Fri, 7 Mar 2014 22:06:29 +0000 (14:06 -0800)]
DO NOT MERGE Add preference for caption text opacity
BUG:
11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
Alan Viverette [Fri, 7 Mar 2014 22:06:07 +0000 (14:06 -0800)]
DO NOT MERGE Remove extra fragment in captioning preferences
BUG:
11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
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"
OSDN Git Service
