Commit Graph

13300 Commits

Author SHA1 Message Date
John Spurlock
0e0122a999 Compile against renamed condition field.
Change-Id: I6a4a28987902551ebf7b775705bed5a6e91f9dca
2014-05-02 00:09:43 -04:00
John Spurlock
04a73fe3c0 Zen mode settings fixes.
- Fix wiring for the "At night" section. Remove fragile index-based
  logic by adding value support to DropDownPreference.
- Actually refresh zen config if it changes.
- Only show the enter zen dialog for user-initiated changes.

Change-Id: Ic3a3b9864942fb3ebf18cd838339de2ff28f9394
2014-05-01 23:07:23 -04:00
John Spurlock
1e2174da96 Merge "Settings preference for choosing long-term conditions." 2014-05-01 19:17:59 +00:00
John Spurlock
23e221cd93 Settings preference for choosing long-term conditions.
Requires change Icba2b8b2 in frameworks/base

Change-Id: I9d7a4f668e3b0e721646e42fa080f201c53a7fe9
2014-05-01 15:14:18 -04:00
Amith Yamasani
dbf094128c Merge "Add a CREATOR in DashboardCategory to support Parcelable" 2014-05-01 17:29:48 +00:00
Amith Yamasani
603b8b6356 Add a CREATOR in DashboardCategory to support Parcelable
Bug: 14410901
Change-Id: I52f85e8d4254caf1a3d0c26bf1805580f78fba99
2014-05-01 10:28:20 -07:00
Rajat Dewan
40a6217fe1 Merge "Adding code to invoke feedback for the device." 2014-05-01 17:16:47 +00:00
Baligh Uddin
0e7ba4e780 Merge "Import translations. DO NOT MERGE" 2014-05-01 16:21:46 +00:00
Alexandra Gherghina
312c4573c3 Switch to using the new enabled flag in UserInfo
Bug: 14377459
Change-Id: Ief309477d964f1158087240ce24030335652d6a7
2014-05-01 11:51:24 +01:00
Alexandra Gherghina
d2019d1373 Merge "Disable profile enabled check (API is changing)" 2014-05-01 10:37:23 +00:00
Rajat Dewan
b42573d0e6 Adding code to invoke feedback for the device.
Please also see http://ag/457938

Change-Id: I842e7211b339ece7066523c503db6e7b0eb12f40
2014-04-30 17:40:01 -07:00
Baligh Uddin
aa18ac395a Import translations. DO NOT MERGE
Change-Id: I67814aed71a60729bb557c7c175d9c886a96dcfc
Auto-generated-cl: translation import
2014-04-30 12:55:27 -07:00
Zhihai Xu
c5f5e93702 am 3cfb6885: am d6b0b172: am 7dd84651: Merge "Display BTH connected status correctly"
* commit '3cfb6885b4075a3887cb0acb437704394fc9e90e':
  Display BTH connected status correctly
2014-04-30 18:44:13 +00:00
Zhihai Xu
3cfb6885b4 am d6b0b172: am 7dd84651: Merge "Display BTH connected status correctly"
* commit 'd6b0b1721a684be1805025908c4733a6b02794a4':
  Display BTH connected status correctly
2014-04-30 18:28:49 +00:00
Zhihai Xu
d6b0b1721a am 7dd84651: Merge "Display BTH connected status correctly"
* commit '7dd84651a25566c5a2152d935f19a11cebfc58ae':
  Display BTH connected status correctly
2014-04-30 18:25:22 +00:00
Zhihai Xu
7dd84651a2 Merge "Display BTH connected status correctly" 2014-04-30 18:22:49 +00:00
Tsuyoshi Kamata
89377530c7 Display BTH connected status correctly
This patch removes incorrect condition.
(to not use LocalBluetoothProfile#isPreferred())
This condition uses the priority that already disconnected profile,
so this codition always returns false.

To verify this issue:
1. Turn on Bluetooth.
2. Pair and connect to BTH(A2DP/HFP)
3. The display now says "Connected"
3. Disconnect HFP profile
4. The display still says "Connected" but it should say "Connected (no phone)"

Change-Id: I9e2bfa6d23bf1be7587c9556b4b05459d02c4817
2014-04-30 18:20:55 +00:00
Amith Yamasani
37fe059e79 Merge "Fix crash on settings launch in secondary user." 2014-04-30 18:03:03 +00:00
Amith Yamasani
a97089d389 Fix crash on settings launch in secondary user.
Bug: 14403545

Make sure the tile wasn't already removed for other reasons.

Change-Id: Ia2b5528c01dbfba4919afaf8352e45db9ef345c3
2014-04-30 10:58:09 -07:00
Amith Yamasani
9d9bb5af16 Merge "Fix crash when adding account" 2014-04-30 17:48:29 +00:00
Amith Yamasani
f5b3f3b445 Fix crash when adding account
Remove the listener in onStop(), to be symmetrical with onStart().

Bug: 14393261
Change-Id: I5d4f0ca38d5ef52b97715b8f3791ff2a400c68e2
2014-04-30 10:38:56 -07:00
Bill Yi
731f9f5f37 am c8883585: am a3860afc: Merge commit \'36a1bbe89025341987df0e380982cfbb4d09fe30\' into HEAD
* commit 'c88835851d57fda27608822ed2cd4ffdb87292fb':
2014-04-30 12:50:28 +00:00
John Spurlock
3252d1cd3a Merge "Add condition provider access to settings." 2014-04-30 02:12:21 +00:00
Bill Yi
c88835851d am a3860afc: Merge commit \'36a1bbe89025341987df0e380982cfbb4d09fe30\' into HEAD
* commit 'a3860afcb5a28971a223f201a17f2583c1109704':
2014-04-30 00:59:39 +00:00
John Spurlock
c9afadb04b Add condition provider access to settings.
Pull NotificationAccessSettings out into a reusable base class
and reuse all of it for a new condition providers settings page.

As with notification listeners, the entire section is hidden if
no apps provide conditions.

Change-Id: Ib5273f3362e392d99647347c23a514e4590f7ac9
2014-04-29 20:21:08 -04:00
Baligh Uddin
46900881d6 Merge "Import translations. DO NOT MERGE" 2014-04-29 21:05:54 +00:00
Dianne Hackborn
211c2cc36d Merge "Update battery charge/drain label." 2014-04-29 20:42:51 +00:00
Bill Yi
a3860afcb5 Merge commit '36a1bbe89025341987df0e380982cfbb4d09fe30' into HEAD 2014-04-29 11:34:27 -07:00
Dianne Hackborn
525f2bdfd2 Update battery charge/drain label.
Match UX spec.

Change-Id: If1408458d488ac2ae3a63449e44ff18fc56e08d5
2014-04-29 11:24:06 -07:00
John Spurlock
a0ceb908bf Merge "Add zen-mode exit condition dialog to settings." 2014-04-29 00:09:53 +00:00
John Spurlock
623a0e9f45 Add zen-mode exit condition dialog to settings.
Change-Id: I7e0f06e681d5c198ae23eaafaa4498939e6453d8
2014-04-28 19:25:41 -04:00
Baligh Uddin
bfb44cd5b7 Import translations. DO NOT MERGE
Change-Id: I95f6438b5e025b17ec95beb5ff5595d428be22b8
Auto-generated-cl: translation import
2014-04-28 12:39:38 -07:00
John Spurlock
3dc6bec751 Merge "Fix settings crash during pathological rotate." 2014-04-28 19:31:02 +00:00
John Spurlock
33e784d979 Fix settings crash during pathological rotate.
Bug:14281882
Change-Id: If30a3e8eea35564853fc12c03f8ab63c258310c9
2014-04-28 15:28:37 -04:00
Jeff Davidson
0d66720788 Merge "Fix wording of debug log statement." 2014-04-28 19:13:26 +00:00
Dianne Hackborn
d30acb2eaf Merge "New preference for selecting new voice interaction service." 2014-04-28 18:28:17 +00:00
Dianne Hackborn
df7e99b733 New preference for selecting new voice interaction service.
This is currently in addition to the existing Voice Search
preference in this UI.  Eventually it will replace that one,
as a superset of its functionality.

Change-Id: I26f1220fa129870cad3ec4152a569a9c494971fb
2014-04-28 11:25:23 -07:00
Jeff Davidson
461d9d0b0f Fix wording of debug log statement.
Change-Id: I59f47dcb9d92b32ab38a7f473b020de9d399d932
2014-04-28 11:23:13 -07:00
Jeff Sharkey
dfd550097f Merge "Disable regulatory info directly, not priority." 2014-04-28 16:39:02 +00:00
Jeff Sharkey
696355a125 Merge "Settings app usually provides regulatory info." 2014-04-28 16:38:38 +00:00
Jeff Sharkey
3daa259d80 Disable regulatory info directly, not priority.
Instead of using priority, offer to launch anyone handling the
action, and use the boolean to control if Settings offers the UI.

Bug: 13340779
Change-Id: Idb3f85c434414911f8911b7511b3a7a8029a8e06
2014-04-28 08:55:12 -07:00
Jeff Sharkey
c6e3b0e448 Settings app usually provides regulatory info.
It takes a higher priority to ensure that it launches over any
third-party apps, but an OEM-provided app may take a higher priority
if they need to provide details.

Bug: 13340779
Change-Id: I8e5dad1a2d0b93be74fa507c0307c87b62e634b8
2014-04-28 08:55:11 -07:00
John Spurlock
c41dfb4f6c Update zen mode settings strings.
Change-Id: I0caeed5825cedb6be16384df4988aab0ea5cdbc6
2014-04-28 11:41:20 -04:00
Alexandra Gherghina
9a1baec5a3 Disable profile enabled check (API is changing)
Bug: 14377459
Change-Id: Ie79db95bcc5c7e3a95b479832dceaf628ae36728
2014-04-28 14:11:35 +01:00
Jeff Davidson
ab8d3e5a03 Merge "Fix NPE in AppListPreference when there is no default." 2014-04-26 18:44:35 +00:00
Jeff Davidson
6b176245f5 Fix NPE in AppListPreference when there is no default.
Bug: 14327074
Change-Id: I3b0dcfbefcfb91278582457beef5823072efc46a
2014-04-26 08:49:59 -07:00
Derek Tan
b0a7811742 Merge "Fix the crash of BandMode app." 2014-04-26 00:27:01 +00:00
Fabrice Di Meglio
769630c895 Settings new dashboard - part 2
Introduce the new Dashboard (a grid like presentation of
Settings top categories) per UX specification.

- the Dashboard is composed of "categories" and in each of them
you have "tiles"
- implement a new layout for showing top categories
(DashboardContainerView). This layout basically acts like a
grid
- depending on the device configuration make the grid with 1
column in portrait / 2 colums in landscape (phones) OR 2 columns
in portrait and 3 in landscape (tablets)
- take care of Accounts adding and removing (as it changes the
number of tiles to show)

Also remove all the old code related to Headers

Change-Id: Ie29944132c1b4c3f7b073d5a7d4453b8f5ec19a7
2014-04-25 17:24:18 -07:00
Derek Tan
eb4575e8c2 Fix the crash of BandMode app.
It crashes because of out of array boundary exception. This app
predefined a list of constant strings of band mode. Unfortunately
the actual supported band modes keep adding and the hardcoded
list can meet.

Change-Id: Ife9683924706a1606d4f72b01a5904e9aa0f782c
2014-04-26 00:15:59 +00:00
Dianne Hackborn
1102f76e58 Merge "Show time remaining / to charge." 2014-04-25 17:06:50 +00:00