Commit Graph

13519 Commits

Author SHA1 Message Date
Selim Gurun
afcd29113f Increase character limits for new added strings
Bug: 14617961

Translation requires higher limits to keep the meaning. Increasing.

Change-Id: I8294b85d5974502dcf86df4ea4a37f84abf06754
2014-05-08 09:32:55 -07:00
Baligh Uddin
04368f580d Merge "Import translations. DO NOT MERGE" 2014-05-08 14:48:41 +00:00
The Android Automerger
4205adc193 merge in master-release history after reset to d65928c558 2014-05-08 05:50:54 -07:00
Baligh Uddin
3d89bad69d Import translations. DO NOT MERGE
Change-Id: Ifcab2fbb6c115e3658377ed28243671eec622f8e
Auto-generated-cl: translation import
2014-05-07 18:25:46 -07:00
Jason Monk
d65928c558 Fix Eclipse Refactoring Issues
Change-Id: I5c16fce7f5478bb6acc9df1b54f386cae95a4a16
2014-05-07 16:28:29 -04:00
Jason Monk
79a9a4e7ee Merge "Support renaming of ProxyProperties to ProxyInfo" 2014-05-07 19:30:35 +00:00
The Android Automerger
9ce03fea4a merge in master-release history after reset to f80bfe5b4a 2014-05-07 09:11:31 -07:00
The Android Automerger
29348d524d merge in master-release history after reset to f80bfe5b4a 2014-05-07 05:50:58 -07:00
Selim Gurun
f80bfe5b4a Merge "Limit broadcast of data reduction proxy change intent" 2014-05-06 17:03:04 +00:00
Baligh Uddin
a96bbec783 Merge "Import translations. DO NOT MERGE" 2014-05-06 14:53:52 +00:00
The Android Automerger
6c09c42619 merge in master-release history after reset to 029c13e1d9 2014-05-06 05:50:47 -07:00
Selim Gurun
980eb545ca Limit broadcast of data reduction proxy change intent
Bug: 12492817

Broadcast the intent to receivers that belong to current user.

Change-Id: I71bfc47bce485c6fe190c05212afdb136c3304db
2014-05-05 18:59:07 -07:00
Selim Gurun
029c13e1d9 Add an experimental webview setting to dev options.
Bug:12492817

Add an experimental webview setting to developer options to enable
data reduction proxy.

Change-Id: I6e0931b39c8dd129622129589ae67352c8396cd2
2014-05-05 17:57:51 -07:00
Baligh Uddin
24f7fff5ea Import translations. DO NOT MERGE
Change-Id: I90f87bf50542811ba99584859da9cc08a2828a0d
Auto-generated-cl: translation import
2014-05-05 13:01:33 -07:00
Jason Monk
e86790c838 Support renaming of ProxyProperties to ProxyInfo
Change-Id: I60621a7155ac2938a54ff466501db9a1013e621b
2014-05-05 12:36:10 -04:00
The Android Automerger
5292f57bbb merge in master-release history after reset to 0e0122a999 2014-05-05 05:50:11 -07:00
The Android Automerger
eab69d0c66 merge in master-release history after reset to 0e0122a999 2014-05-04 05:50:03 -07:00
The Android Automerger
8829c3a706 merge in master-release history after reset to 0e0122a999 2014-05-03 05:51:24 -07:00
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
Alan Viverette
cf0625f09f Quantum.Light for all Settings activities
Change-Id: I7bc0ecb3d349be3dca4c355f9878efdfa0e723cc
2014-05-01 18:11:34 -07:00
Amith Yamasani
9e762eb5b2 Add a CREATOR in DashboardCategory to support Parcelable
Bug: 14410901
Change-Id: I52f85e8d4254caf1a3d0c26bf1805580f78fba99
2014-05-01 12:34:30 -07: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
The Android Automerger
1b28d6c05a merge in master-release history after reset to 312c4573c3 2014-05-01 05:51:02 -07: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
59d4dfad0d 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 11:11:02 -07:00
Amith Yamasani
b1d4e7ee7c Fix crash when adding account
Remove the listener in onStop(), to be symmetrical with onStart().

Bug: 14393261
Change-Id: I5d4f0ca38d5ef52b97715b8f3791ff2a400c68e2
2014-04-30 11:10:56 -07: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
The Android Automerger
dbe0b221f2 merge in master-release history after reset to 3252d1cd3a 2014-04-30 05:51:15 -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