Commit Graph

5779 Commits

Author SHA1 Message Date
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
Narayan Kamath
5877242019 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-13 01:55:25 +00: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
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
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
Felipe Leme
f8d798631b Displays frequency on connected WiFi network info.
Bug: 12767819

Change-Id: Ia71b28b1dd77bdabc53a3e91bd54375bdaebfe4a
2014-03-12 10:50:12 -07:00
Alan Viverette
23d01e0b4b 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-11 23:05:19 +00:00
Alan Viverette
451994bf10 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-11 23:05:13 +00:00
Narayan Kamath
ed44913789 am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-03-11 18:16:11 +00:00
Narayan Kamath
01723221ff am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
2014-03-11 18:16:09 +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
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
Alan Viverette
8840aa4c40 Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 2014-03-11 02:11:52 +00:00
Alan Viverette
d43d5becb3 Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 2014-03-11 02:11:41 +00:00
Matthew Xie
d71a7ffd33 am 0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
* commit '0223f9c5ddfdbcd2c759d1b0cf289844ca0438c0':
  Bluetooth: GAP: Cancel the pairing notification on bond state change
2014-03-11 00:38:26 +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
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
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
Jeff Sharkey
748d3964ec am 14136c7c: Merge "Settings: Fix the memory leak in Settings"
* commit '14136c7cdfee7525a97cfee6eec038994668b6a5':
  Settings: Fix the memory leak in Settings
2014-03-08 01:51:49 +00:00
Alan Viverette
00f221dc9e DO NOT MERGE Add preference for caption text opacity
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2014-03-07 14:06:29 -08:00
Alan Viverette
af28facb6f DO NOT MERGE Remove extra fragment in captioning preferences
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2014-03-07 14:06:07 -08: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
Rob Fletcher
449ac3f62f am 04f36983: 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
2014-03-07 18:30:47 +00:00
Jeff Sharkey
26f5c10684 am 1f37bff7: Merge "Total and available fields missing in Settings storage menu"
* commit '1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
  Total and available fields missing in Settings storage menu
2014-03-07 02:24:13 +00:00
Jeff Sharkey
a97902ef14 am 5b4350f2: Merge "Fix memory leak in ManageApplication"
* commit '5b4350f22f81662436992504e711e462de7a790f':
  Fix memory leak in ManageApplication
2014-03-07 02:24:12 +00:00
Brian Carlstrom
d475ff3bd3 am f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
  packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:32 +00:00
Fabrice Di Meglio
03f5624c8d Merge "Improve query filtering for Search" 2014-03-07 00:36:22 +00:00
Fabrice Di Meglio
0b63458c0b 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
2014-03-06 16:31:12 -08:00
Fabrice Di Meglio
1488c12498 Merge "Fix bug #12910134 Implement Search into the Settings App" 2014-03-06 22:23:55 +00:00