Baligh Uddin
04400ea211
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
2014-03-14 17:54:13 +00:00
Baligh Uddin
c48923edb5
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
2014-03-14 16:36:28 +00:00
Baligh Uddin
c5ff40fea6
am 1badeea1
: (-s ours) am 25503480
: (-s ours) am 7c35c10e
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1badeea19584849f4e324d658a0ce160e6707388':
Import translations. DO NOT MERGE
2014-03-14 16:32:40 +00:00
Baligh Uddin
1badeea195
am 25503480
: (-s ours) am 7c35c10e
: (-s ours) Import translations. DO NOT MERGE
...
* commit '255034803c3301cbf93ce64a2740af2abe8dc1f9':
Import translations. DO NOT MERGE
2014-03-14 16:27:48 +00:00
Paul Lawrence
9cb1e968da
Merge "Don't show IME on pattern"
2014-03-14 14:38:53 +00:00
Baligh Uddin
ecc47ce16f
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
2014-03-14 10:02:46 +00:00
Alan Viverette
c4fa3a727b
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
2014-03-14 10:02:45 +00:00
Alan Viverette
7e71c1ea12
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
2014-03-14 10:02:44 +00:00
Przemyslaw Szczepaniak
cc91f6ff66
am 7a5911a9
: am 375545e2
: am 6829c48c
: Merge "Fix F/C in TTS settings"
...
* commit '7a5911a96d158567bac1e892aee813af1b563a46':
Fix F/C in TTS settings
2014-03-13 23:12:10 +00:00
Fabrice Di Meglio
7e74b409aa
Merge "Fix bug #13440372 More option is displayed with Email/Gmail icon after... scrolling through settings options"
2014-03-13 21:17:21 +00:00
Fabrice Di Meglio
8dcea48d71
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
2014-03-13 21:17:07 +00:00
Paul Lawrence
e54e9323ed
Don't show IME on pattern
...
Bug: 13327729
Change-Id: Ie83dda98558b66c824c15975310a8fb1835e900f
2014-03-13 14:05:48 -07:00
Baligh Uddin
4323f74aa1
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
2014-03-13 18:08:56 +00:00
Alan Viverette
0fa90474e0
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
2014-03-13 18:08:55 +00:00
Alan Viverette
305013b163
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
2014-03-13 18:08:54 +00:00
Baligh Uddin
5969801cc1
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
2014-03-13 18:02:47 +00:00
Alan Viverette
3782a3a6a1
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
2014-03-13 18:02:19 +00:00
Alan Viverette
b4a50745f2
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
2014-03-13 18:02:18 +00:00
Baligh Uddin
a60df014e2
am 846f036e
: (-s ours) am 14b82fd7
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
Import translations. DO NOT MERGE
2014-03-13 17:19:21 +00:00
Dianne Hackborn
fa066b9c1a
Merge "Bat stats: misc, percents are of battery drain."
2014-03-13 17:04:59 +00:00
Dianne Hackborn
17452d5238
Bat stats: misc, percents are of battery drain.
...
Change-Id: I6f1fb6ff33f524fe76d519a6194fad67559193bd
2014-03-13 09:51:19 -07:00
Baligh Uddin
255034803c
am 7c35c10e
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
Import translations. DO NOT MERGE
2014-03-13 16:40:31 +00:00
Baligh Uddin
a28c64dd6c
Merge "Import translations. DO NOT MERGE"
2014-03-13 16:37:47 +00:00
Przemyslaw Szczepaniak
7a5911a96d
am 375545e2
: am 6829c48c
: Merge "Fix F/C in TTS settings"
...
* commit '375545e2fe6da2c2ccae7239f444a92004213018':
Fix F/C in TTS settings
2014-03-13 15:35:41 +00:00
Przemyslaw Szczepaniak
375545e2fe
am 6829c48c
: Merge "Fix F/C in TTS settings"
...
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
Fix F/C in TTS settings
2014-03-13 15:32:48 +00:00
Przemyslaw Szczepaniak
6829c48c36
Merge "Fix F/C in TTS settings"
2014-03-13 15:26:49 +00:00
Alan Viverette
429720754d
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
2014-03-13 10:01:45 +00:00
Alan Viverette
c736f794ac
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
2014-03-13 10:01:42 +00:00
Shuhrat Dehkanov
f365216391
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 >
2014-03-13 12:06:17 +09:00
Fabrice Di Meglio
6c9e03fd6d
More code cleaning
...
- use var for context.getResources()
- rename var
Change-Id: I8b8b7ffdd2c83bdbec7a4f162757597032aa9fb0
2014-03-12 17:19:39 -07:00
RoboErik
acfcf69b34
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
2014-03-12 23:04:48 +00:00
RoboErik
64beb27898
am 0b71937d
: am 5791cecc
: b/12068020 Update calls to InputManager. Do not merge
...
* commit '0b71937d304d701fb0edc1cd3720bcadb264d9f9':
b/12068020 Update calls to InputManager. Do not merge
2014-03-12 21:15:48 +00:00
RoboErik
0b71937d30
am 5791cecc
: b/12068020 Update calls to InputManager. Do not merge
...
* commit '5791cecc9e0a4169c71b87696973441071e295c8':
b/12068020 Update calls to InputManager. Do not merge
2014-03-12 21:12:27 +00:00
Fabrice Di Meglio
7cacc12009
Code cleaning - class names
...
- use class names instead of their static string representation
Change-Id: I82ebfc087bc2bbadb9076c5750265bf400ff4224
2014-03-12 13:19:34 -07:00
Fabrice Di Meglio
757450247d
Merge "Add dynamic Preferences indexing"
2014-03-12 19:58:06 +00:00
RoboErik
5791cecc9e
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
2014-03-12 12:53:46 -07:00
Svetoslav
92915638d4
Merge "Remove unused fields and imports."
2014-03-12 19:49:18 +00:00
Svetoslav
177618fac5
Remove unused fields and imports.
...
Change-Id: If95879a506a9657b3dd370a35c1060712dcb9e93
2014-03-12 12:48:16 -07:00
Lifu Tang
d0e9b3f202
Merge "Re-register listener for the switch upon onResume"
2014-03-12 19:46:52 +00:00
Baligh Uddin
b4bc781699
Import translations. DO NOT MERGE
...
Change-Id: I740417ae9fb2163d81b85ec337d2f1687ebb1a5f
Auto-generated-cl: translation import
2014-03-12 12:08:43 -07:00
Baligh Uddin
7c35c10ebc
Import translations. DO NOT MERGE
...
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
2014-03-12 12:02:29 -07:00
Lifu Tang
1bb6c75cdf
Re-register listener for the switch upon onResume
...
- Fix b/13330300
Change-Id: I6a5f97c383913dd461ec30d4e30585d325287ccc
2014-03-12 11:55:30 -07:00
Dan Sandler
39e9ab37b1
Merge "Finally, a place for notification settings."
2014-03-12 18:38:22 +00:00
Fabrice Di Meglio
5d702d90f3
Merge "Code refactoring"
2014-03-12 18:36:46 +00:00
Fabrice Di Meglio
b8dfbf1409
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
2014-03-12 11:34:59 -07:00
Dan Sandler
347f944a22
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
2014-03-12 14:15:09 -04:00
Baligh Uddin
846f036ef1
am 14b82fd7
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '14b82fd73f59f51dffee9562057ab747f12134d3':
Import translations. DO NOT MERGE
2014-03-11 17:41:25 +00:00
Baligh Uddin
14b82fd73f
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-03-11 17:37:53 +00:00
Baligh Uddin
1c170dbecf
Merge "Import translations. DO NOT MERGE"
2014-03-11 17:37:48 +00:00
Narayan Kamath
cce74886eb
am 677f32b1
: am d4cf5c55
: am c776bbb1
: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
...
* commit '677f32b1bb97b1c4f23af4315d401197b4857632':
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
2014-03-11 15:21:11 +00:00