Commit Graph

13250 Commits

Author SHA1 Message Date
John Spurlock
6a8919299f Merge "Add switch to zen mode settings preference page." 2014-03-28 13:09:51 +00:00
John Spurlock
f3e32e3410 Merge "Settings: Implement new required method." 2014-03-28 13:08:59 +00:00
Baligh Uddin
abe81e7a8b am 1df63dd8: (-s ours) am 584ac4c5: (-s ours) am f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '1df63dd8afa947b9a0e1b1295d5bf042cb2aec3f':
  Import translations. DO NOT MERGE
2014-03-27 23:17:00 +00:00
Baligh Uddin
1df63dd8af am 584ac4c5: (-s ours) am f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '584ac4c525d45dfdc61f3f9db746582622e2ab5b':
  Import translations. DO NOT MERGE
2014-03-27 23:10:42 +00:00
Baligh Uddin
584ac4c525 am f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit 'f39672bfac77a604a3a04484f7d88adc4ecf9c66':
  Import translations. DO NOT MERGE
2014-03-27 23:05:03 +00:00
Baligh Uddin
140f3dff92 am 5c5bfbb0: (-s ours) am 1dc01d10: (-s ours) Import translations. DO NOT MERGE
* commit '5c5bfbb048d5b92b095e974496a48cd3b7ff8baf':
  Import translations. DO NOT MERGE
2014-03-27 22:26:39 +00:00
Baligh Uddin
5c5bfbb048 am 1dc01d10: (-s ours) Import translations. DO NOT MERGE
* commit '1dc01d10ddb19355dc21b6e677afcf33aa460136':
  Import translations. DO NOT MERGE
2014-03-27 22:22:05 +00:00
Baligh Uddin
f39672bfac am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '3a9b49f975df7c53e86dd795e21f904442c22a4a':
  Import translations. DO NOT MERGE
2014-03-27 22:22:03 +00:00
Baligh Uddin
e0dbd4e42b Merge "Import translations. DO NOT MERGE" 2014-03-27 21:48:36 +00:00
Nicholas Sauer
c33baa4294 Merge "Skip bluetooth device iteration if LocalBluetoothManager is null" 2014-03-27 21:37:19 +00:00
Nicholas Sauer
cb644cc2e7 Skip bluetooth device iteration if LocalBluetoothManager is null
bug:13653239

Change-Id: I163c47b626825b2f83bb63d9f6900216ce44ae41
2014-03-27 14:28:33 -07:00
John Spurlock
7f502bf824 Add switch to zen mode settings preference page.
Bug:13670014
Change-Id: Id45841818e2fe8f57b5db47df3b0add06be6967a
2014-03-27 10:21:04 -04:00
Amith Yamasani
c96ccc8585 Merge "Don't allow user creation on phones via Settings search" 2014-03-26 23:27:10 +00:00
Amith Yamasani
cfb8d7f3c8 Don't allow user creation on phones via Settings search
This screen was blocked from appearing in the main Settings list, but
search now exposes it.

Disable content on the Users screen if multiple users are not supported
on the device. This is a temporary fix until Settings search does the
right thing.

Bug: 13631986
Change-Id: Icc61d3e9ce4e405d0cf8841af538216be59fac26
2014-03-26 14:46:47 -07:00
Baligh Uddin
517f03606f Import translations. DO NOT MERGE
Change-Id: If8a371ad883f5b1d685b551f781b7dd6c2698eba
Auto-generated-cl: translation import
2014-03-26 14:17:52 -07:00
Baligh Uddin
1dc01d10dd Import translations. DO NOT MERGE
Change-Id: I09b061fd0c7dd8e4ea00e6627af4e8dfa0d01200
Auto-generated-cl: translation import
2014-03-26 14:11:08 -07:00
Baligh Uddin
3a9b49f975 Import translations. DO NOT MERGE
Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import
2014-03-26 14:08:55 -07:00
John Spurlock
8ce107effa Update zen mode settings.
Change-Id: I61b62dec9ddeb9314130151e397a65aed52e1af1
2014-03-26 13:42:15 -04: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
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
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
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
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
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