PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,368 Commits 1 Branch 0 Tags
f02db01ba6c255cffee5a334cd1b0ee7e01f116c
Commit Graph

13368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
f1b94b2f67 Import translations. DO NOT MERGE 
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
 2014-03-10 15:28:38 -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
Wei Wang
5632e40e13 am a8e634ca: 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 06:24:57 +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
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
Rob Fletcher
280ab2e580 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
 2014-03-07 03:02:59 +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
Rob Fletcher
d58459cbb9 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
 2014-03-06 22:56:39 +00:00
Rob Fletcher
99fa73361f 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
 2014-03-06 22:51:57 +00:00
Rob Fletcher
8ce54bd640 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
 2014-03-06 22:41:29 +00:00
Fabrice Di Meglio
1488c12498 Merge "Fix bug #12910134 Implement Search into the Settings App" 2014-03-06 22:23:55 +00:00
Fabrice Di Meglio
0d4005a1c7 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
 2014-03-06 14:17:48 -08:00
Rob Fletcher
04f3698345 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
 2014-03-06 21:59:31 +00:00
Rob Fletcher
549a39b495 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
 2014-03-06 11:51:15 -08:00
Fabrice Di Meglio
a1b187acec Merge "Fix bug #13327889 Launching Wifi setting using available wifi network ...notification does not show ON/OFF button for wifi" 2014-03-06 18:46:54 +00:00
Wei Wang
1a188f4075 DO NOT MERGE Change bluetooth off display message. 
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
 2014-03-06 18:45:35 +00:00
Baligh Uddin
1f7b93c5ba Merge "Import translations. DO NOT MERGE" 2014-03-06 17:37:57 +00:00
Tom O'Neill
140563c930 Merge "Remove some usages of deprecated location APIs" 2014-03-06 17:30:36 +00:00
Fabrice Di Meglio
565d8b7bcc Fix bug #13327889 Launching Wifi setting using available wifi network 
...notification does not show ON/OFF button for wifi

- the notification was launching the WifiPickerActivity which is
a PreferenceActivity, so take care of this case too.

Change-Id: I64f58d4b9f75141626bb6f0266cf2f17fbb39fc7
 2014-03-05 17:27:50 -08:00
Fabrice Di Meglio
835c5e4ef9 Merge "Fix bug #13322036 stability-sys: Java crash in com.android.settings: android.database.sqlite.SQLiteException: malformed MATCH expression: [ avs- /y@ggmd"*] (code 1)" 2014-03-06 00:27:40 +00:00
Fabrice Di Meglio
3ec129b1b5 Fix bug #13322036 stability-sys: Java crash in com.android.settings: 
android.database.sqlite.SQLiteException: malformed MATCH expression: [ avs- /y@ggmd"*] (code 1)

- the real issue was linked to the double quote
- add an InputFilter to the query EditText so that we allow only
Letters / Digits / Spaces (and this should works for all Locales)

Change-Id: I6016cc25d154b386870379dfa4c79a40c5505530
 2014-03-05 16:24:35 -08:00
Baligh Uddin
27e9f6d8e7 Import translations. DO NOT MERGE 
Change-Id: Id18f29d4a6ce3cc7fe2abc64768d00035b91a4e3
Auto-generated-cl: translation import
 2014-03-05 13:07:50 -08:00
Tom O'Neill
dad115e2db Remove some usages of deprecated location APIs 
Bug: 13302202
Change-Id: I916568d2b310eaf9a8b30da9a9980344aaf76c21
 2014-03-05 09:31:09 -08:00
John Spurlock
81ccaeac4f Update zen mode config view to reflect new default. 
Change-Id: I5084d440a351dd2be1171139107220cab86718f6
 2014-03-04 19:05:46 -05:00
Fabrice Di Meglio
72af648a1e Merge "Fix bug #13300024 Settings app crashes on changing device orientation" 2014-03-04 20:57:51 +00:00
Fabrice Di Meglio
4931d7cc16 Fix bug #13300024 Settings app crashes on changing device orientation 
- remove crashing code. Basically let the Framework do its work.
No need to save the state of the EditText by ourselves.

Change-Id: I49e98a852f4fcda61eabaa2967d027942905ec27
 2014-03-04 12:57:11 -08:00
Yuhao Zheng
8d4882c16b Merge "Make Setting UI use system proxy validity check" 2014-03-04 17:43:46 +00:00
Baligh Uddin
dcdbd68ad5 Merge "Import translations. DO NOT MERGE" 2014-03-04 17:11:05 +00:00
Wei Wang
d952fb07fd Change bluetooth off display message. 
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
 2014-03-03 17:43:19 -08:00