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

13519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
ef75a081c1 merge in master-release history after reset to master 2014-03-26 05:50:44 -07:00
Baligh Uddin
bece8e8423 am ea5d0040: (-s ours) am a2ea9ac6: (-s ours) am 5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ea5d00400b07f918d4d5761dfe4c92fd81cb1992':
  Import translations. DO NOT MERGE
 2014-03-25 21:22:46 +00:00
Baligh Uddin
d2bb275a3c am 4641bf95: (-s ours) am bbcd64cb: (-s ours) am 7bad0786: (-s ours) am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit '4641bf95bccfb94585ff50f72174fd5160a764dc':
  Import translations. DO NOT MERGE
 2014-03-25 21:20:59 +00:00
Baligh Uddin
ea5d00400b am a2ea9ac6: (-s ours) am 5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'a2ea9ac68fba4168566a87223f3f557bed33a2ac':
  Import translations. DO NOT MERGE
 2014-03-25 19:13:08 +00:00
Baligh Uddin
a2ea9ac68f am 5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '5f4696f8e00731d2825ec6fc7d24c020f3e75f73':
  Import translations. DO NOT MERGE
 2014-03-25 19:06:01 +00:00
Baligh Uddin
52da9af092 Merge "Import translations. DO NOT MERGE" 2014-03-25 19:03:39 +00:00
Baligh Uddin
5f4696f8e0 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-25 19:01:04 +00:00
Baligh Uddin
4641bf95bc am bbcd64cb: (-s ours) am 7bad0786: (-s ours) am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'bbcd64cb8b126298528264f781df2a996ff29ab6':
  Import translations. DO NOT MERGE
 2014-03-25 17:22:42 +00:00
Baligh Uddin
bbcd64cb8b am 7bad0786: (-s ours) am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit '7bad0786ec63fc513a195579417901722c8689db':
  Import translations. DO NOT MERGE
 2014-03-25 17:07:48 +00:00
Baligh Uddin
7bad0786ec am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'b86dff8480e486847148f9651bc830b762d307ee':
  Import translations. DO NOT MERGE
 2014-03-25 17:02:02 +00:00
Baligh Uddin
36a1bbe890 am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'b86dff8480e486847148f9651bc830b762d307ee':
  Import translations. DO NOT MERGE
 2014-03-25 17:02:01 +00:00
John Spurlock
f02616f397 Settings: Implement new required method. 
Only required since it uses the non-public version
of the api.

Bug:13562828
Change-Id: I63230962ac886465b3a1a2721e65b1d3fac33707
 2014-03-25 13:01:20 -04:00
Baligh Uddin
b86dff8480 am da4a6a53: (-s ours) Import translations. DO NOT MERGE 
* commit 'da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
  Import translations. DO NOT MERGE
 2014-03-25 16:54:48 +00:00
The Android Automerger
0bc1478da8 merge in master-release history after reset to master 2014-03-25 05:50:27 -07:00
Baligh Uddin
f675b0f4cc Import translations. DO NOT MERGE 
Change-Id: If05b5e4e9f0da7a811dcbe2d3837326310338438
Auto-generated-cl: translation import
 2014-03-24 13:07:04 -07:00
Baligh Uddin
7eab908944 Import translations. DO NOT MERGE 
Change-Id: I75bc6fa1afafd7abc9a8d0af3e8825c053225807
Auto-generated-cl: translation import
 2014-03-24 13:01:09 -07:00
Baligh Uddin
da4a6a53d4 Import translations. DO NOT MERGE 
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
 2014-03-24 12:59:14 -07:00
The Android Automerger
3b99c5f5fb merge in master-release history after reset to master 2014-03-22 05:52:29 -07:00
Dianne Hackborn
55985d2cec Switch to new "cpu running" state for showing wake time in chart. 
Change-Id: I69b27c506e057353d9ee32f5d80e3077c7eba207
 2014-03-21 14:14:39 -07:00
Fabrice Di Meglio
5f3442af6f Use SearchIndexableData enable state for WiFi Settings 
- same as for Bluetooth
- now the remembered WiFi networks names can be indexed when
WiFi is turned on

Change-Id: I904ce6a425c21ee07ce3ee8fdc0cd71ab5a18d12
 2014-03-21 13:50:25 -07:00
Fabrice Di Meglio
51bfee595c Add dynamic Preferences indexing (part 2) 
- change the Index SQL model. Add a new "enabled" column.
- use that column for issuing a more restrictive search query
- change the SearchIndexProvider API to pass the "enable" state
- apply it to Bluetooth settings
- refactor the list of indexable resources (SearchIndexableResources)

Change-Id: Ic900fb27cb12a285a80d953aa1aa88f0070cd986
 2014-03-20 20:40:04 -07:00
Fabrice Di Meglio
3107759662 Fix bug #13563247 Settings crash on launch in secondary user 
- add missing permission android.permission.READ_SEARCH_INDEXABLES

Change-Id: I577f8bfebf5e29e7954ca36cf65e981464aa5924
 2014-03-20 15:12:32 -07:00
Fabrice Di Meglio
30eb2d3dd1 Merge "Add indexing for cached Bluetooth (BT) paired devices" 2014-03-20 21:13:04 +00:00
Baligh Uddin
2ac2df25a7 am 3f114d6f: (-s ours) am 31a72b07: (-s ours) am e3a0b402: (-s ours) am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '3f114d6f06a8479d78ea1cf095bd3ef58fe430b1':
  Import translations. DO NOT MERGE
 2014-03-20 21:05:47 +00:00
Fabrice Di Meglio
5135dce142 Add indexing for cached Bluetooth (BT) paired devices 
- comply to the SEARCH_INDEX_DATA_PROVIDER
- add to the Index the name of previously paired BT devices
(this will work for now only and only if BT has been on during
the indexing)

Change-Id: I00065db0f4e9657cca3578a2fafa0ec39cfaa432
 2014-03-20 14:02:42 -07:00
Wei Wang
b4f18b8d3b am 826eaa18: (-s ours) am a95228ff: am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
* commit '826eaa18b2cd8a6c22f22037f43cd485a3df3794':
  DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
 2014-03-20 19:30:28 +00:00
Fabrice Di Meglio
5cb81614dd Merge "Fix bug #13563247 Settings crash on launch in secondary user" 2014-03-20 19:26:55 +00:00
Fabrice Di Meglio
485b1b828c Fix bug #13563247 Settings crash on launch in secondary user 
- add missing permission android.permission.READ_SEARCH_INDEXABLES

Change-Id: I577f8bfebf5e29e7954ca36cf65e981464aa5924
 2014-03-20 12:24:57 -07:00
Baligh Uddin
3f114d6f06 am 31a72b07: (-s ours) am e3a0b402: (-s ours) am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '31a72b0769d12cd07f453c7f50309d0729d7734e':
  Import translations. DO NOT MERGE
 2014-03-20 19:12:59 +00:00
Baligh Uddin
31a72b0769 am e3a0b402: (-s ours) am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit 'e3a0b402c3d9163b5dff884c44d3a5f2a86e80aa':
  Import translations. DO NOT MERGE
 2014-03-20 19:09:05 +00:00
Baligh Uddin
d274a6cfa2 am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
  Import translations. DO NOT MERGE
 2014-03-20 19:04:14 +00:00
Baligh Uddin
e3a0b402c3 am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
  Import translations. DO NOT MERGE
 2014-03-20 19:02:30 +00:00
Baligh Uddin
2e71c1df7c am 947e8995: (-s ours) Import translations. DO NOT MERGE 
* commit '947e8995856a66d05bfb614edf00dd5edfecc4ba':
  Import translations. DO NOT MERGE
 2014-03-20 18:41:54 +00:00
Baligh Uddin
441d85e30a Merge "Import translations. DO NOT MERGE" 2014-03-20 18:38:24 +00:00
Dianne Hackborn
5c273582b3 Merge "Fix to show correct percentage in battery details." 2014-03-20 16:44:51 +00:00
Wei Wang
826eaa18b2 am a95228ff: am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
* commit 'a95228ff5bca8620e5a866056e13c15d344c2a8c':
  DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
 2014-03-20 16:29:09 +00:00
Wei Wang
a95228ff5b am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
* commit '41f5437def4b97581d67b5636ca2dba10f8eb385':
  DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
 2014-03-20 16:24:12 +00:00
Paul Lawrence
dafbc9b02d Merge "Handle pattern cooldown correctly" 2014-03-20 13:33:54 +00:00
The Android Automerger
705e800b9b merge in master-release history after reset to master 2014-03-20 05:50:49 -07:00
Wei Wang
41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
 2014-03-19 22:37:27 -07:00
Fabrice Di Meglio
ba8c188bf0 Merge "Add external Preferences indexing" 2014-03-20 01:15:08 +00:00
Dianne Hackborn
1ca16bb65b Fix to show correct percentage in battery details. 
Change-Id: I5745ca4dc6330b044e02e94630cf3d2c3e1266af
 2014-03-19 17:13:43 -07:00
Fabrice Di Meglio
fa7dc240e9 Add external Preferences indexing 
- define SettingsSearchIndexablesProvider as an internal
SearchIndexablesProvider
- protect access thru using android.permission.READ_SEARCH_INDEXABLES
- update WallpaperTypeSettings and WifiSettings for taking care of
the new model
- update the Dashboard for taking care about external Icons for the
search result
- update sqlite model/version for taking care about Intents
(enable launching external applications for showing the settings)

Change-Id: I2e38599327e6480f1754f52666becce0884cee9d
 2014-03-19 14:56:09 -07:00
Baligh Uddin
105f270068 Import translations. DO NOT MERGE 
Change-Id: I798e5e572d16aef5e4940923b74bdc25d2ef99b1
Auto-generated-cl: translation import
 2014-03-19 13:17:30 -07:00
Baligh Uddin
947e899585 Import translations. DO NOT MERGE 
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
 2014-03-19 13:10:41 -07:00
Amith Yamasani
3929cdcfca Merge "Allow spell checking in owner info field" 2014-03-19 19:47:33 +00:00
Amith Yamasani
07e52cf615 Allow spell checking in owner info field 
Bug: 10231042
Change-Id: Ifbf8aa92de9fd92a16e3b292169b1cf7b4d1eb4f
 2014-03-19 12:32:54 -07:00
Tom O'Neill
a7f399123f Injected settings start new task 
- Bug: 13534214

Change-Id: I10b47f58651166a58a86efe8da2979e8f9a2a5cb
 2014-03-19 10:38:05 -07:00
Russell Brenner
1b35e479e6 Merge "Improve support for default theme of WifiSetupActivity" 2014-03-19 15:57:43 +00:00
Jaewan Kim
16ff27d3f7 Refactor IpConfiguration from WifiConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: Ia3de8eb92cd014f449525fe1ef9cbe86470bf347
 2014-03-19 11:24:16 +09:00