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
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
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
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
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
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
Narayan Kamath
677f32b1bb
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.""
2014-03-11 15:17:28 +00:00
Narayan Kamath
d4cf5c5578
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.""
2014-03-11 15:14:15 +00:00
Narayan Kamath
c776bbb156
Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
2014-03-11 15:07:14 +00:00
Narayan Kamath
0a2bc1cc76
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
...
This reverts commit 9ebc27c73e
.
Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
2014-03-11 13:05:37 +00:00
Fabrice Di Meglio
2f4556e31b
Code refactoring
...
Change-Id: I053ab0c691295b81dc7aa0fd858fd609a69ade81
2014-03-10 17:30:30 -07:00
Fabrice Di Meglio
deb49d0f09
Merge "Remove duplicates into Search results"
2014-03-10 23:10:24 +00:00
Fabrice Di Meglio
489362c83c
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
2014-03-10 16:00:50 -07:00
Baligh Uddin
a035856515
Import translations. DO NOT MERGE
...
Change-Id: Ia1690f2bfef7a44b6545da8cef61f06fa691b897
Auto-generated-cl: translation import
2014-03-10 15:39:07 -07:00
Fabrice Di Meglio
3386f55caa
Merge "Fix bug #13394626 Settings app crashes on changing orientation to landscape mode"
2014-03-10 19:47:49 +00:00
Fabrice Di Meglio
b643cbf6d6
Fix bug #13394626 Settings app crashes on changing orientation to landscape mode
...
- fix NPE on mInitialHeader.id
Change-Id: Ic1017f5a8a20755bf7f36b1f3406d45dcc80ae8f
2014-03-10 12:18:39 -07:00
Wei Wang
ccdebacf6a
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.
2014-03-08 11:02:09 +00:00
Fabrice Di Meglio
c6428c05fa
Merge "Fix Drawer selection when using BACK"
2014-03-08 02:19:40 +00:00
Fabrice Di Meglio
75eabc20b9
Fix Drawer selection when using BACK
...
- select the initial Header if needed
Change-Id: I2d884fbab9a49cc3385dbe1b311f9e0853d027d3
2014-03-07 18:17:03 -08:00
Wei Wang
9075a6e21c
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.
2014-03-08 02:15:01 +00:00
Wei Wang
c8962d0770
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.
2014-03-08 02:11:25 +00:00
Wei Wang
6663b24574
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.
2014-03-08 02:07:30 +00:00
Wei Wang
a8e634ca53
am 104eea0b
: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
...
* commit '104eea0b97c63b97040dc26ddf3635257e1b19a2':
DO NOT MERGE Change bluetooth off display message.
2014-03-08 02:02:19 +00:00
Wei Wang
104eea0b97
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
2014-03-08 02:00:37 +00:00
Fabrice Di Meglio
9e8d173786
Merge "Close the Drawer on BACK button if the Drawer is opened"
2014-03-07 21:00:54 +00:00
Fabrice Di Meglio
c95be4fbb3
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
2014-03-07 12:57:38 -08:00
Fabrice Di Meglio
bb74c5f1c9
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"
2014-03-07 19:23:43 +00:00
Fabrice Di Meglio
832e546185
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
2014-03-07 11:18:36 -08:00