Commit Graph

28681 Commits

Author SHA1 Message Date
Andrew Sapperstein
61c34c0556 Merge \"Update Settings to use DeviceDefault.Settings.\" into nyc-mr1-dev
am: 70ff5f8fa1

Change-Id: I3b556a3f7b0146deadf59b7c8fb244580b060fdf
2016-06-21 23:49:59 +00:00
Daniel Nishi
bf8f896879 Update the deletion helper intent string.
Bug: 28675265
Change-Id: Ic56e1617d0cf66e347c3a9b31592de4737b19bb3
2016-06-21 16:06:12 -07:00
Andrew Sapperstein
70ff5f8fa1 Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev 2016-06-21 23:02:13 +00:00
Steven Ng
54ce1da49d Disable "disable" button for the device provision app in the Settings app
Bug: 29116229
Change-Id: I41076238f34f497c48cfd98a2466ac10cca6e989
2016-06-21 22:43:54 +01:00
Doris Ling
ec354cd326 Remove summary text for Backup & reset.
Remove the SummaryProvider from PrivacySettings so that it will not show
the summary for the Backup & reset settings.

Bug: 29519430
Change-Id: Idf41c2f794391f81bf864ade0db9087c2e3e1c0e
2016-06-21 13:29:07 -07:00
Doris Ling
bdbd9e43d1 Merge \"Add play icon to the gesture settings videos.\" into nyc-mr1-dev
am: 9ca0e6cc86

Change-Id: I542d48564a52b2ae7dd8497cdebde19086fe53bb
2016-06-21 19:04:29 +00:00
Doris Ling
9ca0e6cc86 Merge "Add play icon to the gesture settings videos." into nyc-mr1-dev 2016-06-21 18:55:54 +00:00
Andrew Sapperstein
e300b0fc1c Use colorSecondary for switch bar backgrounds.
Delete the private version in favor of using the platform's.

BUG: 28625050
Change-Id: I6bf0a13e5018f48f32a26a38307c30cf1aee0619
2016-06-21 11:50:20 -07:00
Daniel Sandler
09c38bb326 Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am: 87fcf9e95f
am: 698fe0a9b0

Change-Id: I4d1d95d66b02d18c6f2ba80b0348895e542ae57f
2016-06-21 18:29:19 +00:00
Daniel Sandler
92e908b68e Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am: 87fcf9e95f
am: 7df9a28fdb

Change-Id: I14d23175a455c21df8d526bfa2ae034e80e199d5
2016-06-21 18:28:35 +00:00
Andrew Sapperstein
5b66e143cc Update Settings to use DeviceDefault.Settings.
BUG: 28625050

Change-Id: Id283703a309cf27bb284147421614196e903c660
2016-06-21 11:23:39 -07:00
Dan Sandler
698fe0a9b0 Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am: 87fcf9e95f

Change-Id: I94d18998914552d21099b12b22471ea93857cf52
2016-06-21 18:18:21 +00:00
Dan Sandler
7df9a28fdb Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am: 87fcf9e95f

Change-Id: I40778ba470d12dd6f5b924ddcf650f27459faab6
2016-06-21 18:17:08 +00:00
Daniel Sandler
87fcf9e95f Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev 2016-06-21 18:11:11 +00:00
Pavel Zhamaitsiak
7fffd051fa Merge \"Hide WFC settings if WFC is not provisioned (and provisioning is required)\" into nyc-mr1-dev
am: 4f3a7589bc

Change-Id: Id9a51ea55922879c2776964d7a0d3c7a3ad8877b
2016-06-21 18:09:07 +00:00
Jason Monk
cf7c2374a9 Fix tethering re-enable after edit.
Sometimes the tether state change comes in late (or seemingly not
at all).  Also listen for wifi ap state changes as a fallback for
this case.

Change-Id: I6677c4277453be881967a3cf2234de11cd0237b8
Fixes: 28851179
2016-06-21 14:06:48 -04:00
TreeHugger Robot
4f3a7589bc Merge "Hide WFC settings if WFC is not provisioned (and provisioning is required)" into nyc-mr1-dev 2016-06-21 17:58:26 +00:00
Jason Monk
d589bafc4a Update battery content descriptions with labels
Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes: 28301362
2016-06-21 13:36:57 -04:00
Fan Zhang
e4d1e73c87 Merge \"Enable/disable support buttons based on operation hours.\" into nyc-mr1-dev
am: a00e3b78de

Change-Id: I62abaad50d57747197450dd09c7fb224a1a10ec1
2016-06-21 17:27:31 +00:00
Fan Zhang
a00e3b78de Merge "Enable/disable support buttons based on operation hours." into nyc-mr1-dev 2016-06-21 17:21:07 +00:00
Bill Yi
fc4fb60597 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours
am: 440199c6c4  -s ours

Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef
2016-06-21 17:02:49 +00:00
Daniel Nishi
aad643caf2 Remove the Deletion Helper and Automatic Storage Management jobs.
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.

Bug: 28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
2016-06-21 10:00:52 -07:00
Bill Yi
9cfd92d7d8 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours
am: 672e1ddb14  -s ours

Change-Id: Ia75f957c8348a0562d7941220b8a796fe57d363d
2016-06-21 16:58:10 +00:00
Bill Yi
475d022e59 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 5903be35f4  -s ours

Change-Id: I12bdb0e46f4401413a38b8b699e464929e88f504
2016-06-21 16:58:09 +00:00
Bill Yi
440199c6c4 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: f315e2e6f0  -s ours

Change-Id: I2b7c6b292d8197f588fca6dc8c05a329e58d6733
2016-06-21 16:56:45 +00:00
Bill Yi
672e1ddb14 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: f315e2e6f0  -s ours

Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc
2016-06-21 16:56:44 +00:00
TreeHugger Robot
5903be35f4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-21 16:53:39 +00:00
TreeHugger Robot
f315e2e6f0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-21 16:53:26 +00:00
Sunny Goyal
6f38bd7620 Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
am: 139fbb78b5

Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a
2016-06-21 16:48:12 +00:00
Sunny Goyal
139fbb78b5 Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev 2016-06-21 16:39:33 +00:00
Zoltan Szatmary-Ban
3659d42b32 Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
am: e341462a50

Change-Id: Idc9d5d2381b7c33cedc6b3d1e8bac1776b3ab1e9
2016-06-21 16:00:35 +00:00
Zoltan Szatmary-Ban
e341462a50 Fix non-app non-user preferences in Settings > Data usage
am: afea1cae25

Change-Id: I55e991f5cd9c39a740dd62945fe113ee59ea18a9
2016-06-21 15:57:08 +00:00
Zoltan Szatmary-Ban
3b629c6918 Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
am: 63170fbf7a

Change-Id: Iabfb95c0b071b8ebe2ab8a659d323a9cda2656d5
2016-06-21 15:55:07 +00:00
Zoltan Szatmary-Ban
63170fbf7a Fix non-app non-user preferences in Settings > Data usage
am: afea1cae25

Change-Id: I09905ec152a16e12436927bd514fb6cbe5afb59a
2016-06-21 15:52:33 +00:00
Fan Zhang
1b6d911793 Merge \"Log button taps in support tab.\" into nyc-mr1-dev
am: a2fe136837

Change-Id: I661ffe3744f44e69e886e8f5a825304f2c022d4b
2016-06-21 15:35:07 +00:00
Fan Zhang
a2fe136837 Merge "Log button taps in support tab." into nyc-mr1-dev 2016-06-21 15:28:31 +00:00
Zoltan Szatmary-Ban
afea1cae25 Fix non-app non-user preferences in Settings > Data usage
Bug:29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
2016-06-21 12:57:30 +01:00
Bill Yi
efd819e862 Import translations. DO NOT MERGE
Change-Id: Ia258f44583c5690bd396d20517e1309807c659ad
Auto-generated-cl: translation import
2016-06-21 04:40:02 -07:00
Bill Yi
2d85beec1e Import translations. DO NOT MERGE
Change-Id: Iebfc06a928c222879aceec01c3aaf35f2cf78561
Auto-generated-cl: translation import
2016-06-21 04:28:46 -07:00
Dan Sandler
89d5659643 Show "0" instead of "0 B" in storage settings.
Two benefits:
  - "0 B" might be a little confusing for sighted users
  - "zero bee" is definitely confusing for TalkBack users

Nonzero storage items will still read as "640 KB" which
should be enough for anyone.

Change-Id: I5c89f7c6382ca14fb91d7d1dd145977f855618ae
Fixes: 27973778
2016-06-21 00:33:16 -04:00
Pavel Zhamaitsiak
e2f59b90ad Hide WFC settings if WFC is not provisioned (and provisioning is required)
Bug: 29223318
Change-Id: Ic927e742d84f55ea411a0d034fc1caac72ee58e7
2016-06-20 17:52:48 -07:00
Sunny Goyal
5f179fcef1 Adding custom manifest shortcuts in Settings app
Bug:28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
2016-06-20 16:44:17 -07:00
Julia Reynolds
f2495079ed Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
am: 07e85aa5c0

Change-Id: I409fd02854876c68e004cdb62500fdbaffd4085d
2016-06-20 19:18:31 +00:00
Julia Reynolds
4606b359e9 Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
am: 018444ab61

Change-Id: I1946b95fd5ccf8e4506b452998c478c2781d3e3a
2016-06-20 19:12:14 +00:00
Julia Reynolds
018444ab61 Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d

Change-Id: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
2016-06-20 19:08:43 +00:00
Julia Reynolds
07e85aa5c0 Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d

Change-Id: I2763437122129654485c80b7652729526042321a
2016-06-20 18:58:07 +00:00
Julia Reynolds
43b04bcc7d Merge "Fix NPE printing notification actions." into nyc-dev 2016-06-20 18:43:04 +00:00
Fan Zhang
841b13ac98 Enable/disable support buttons based on operation hours.
Also update support title based on whether support operation is
available.

Bug: 28827790
Change-Id: I65eb70d18ba16ccc263bce019fcbbe5e10ffa596
2016-06-20 11:18:51 -07:00
Jason Monk
ea8e259e42 Fix focusability of battery history chart am: 9c6ab88bd7
am: 5c3f9459e8

Change-Id: If0977bcf4fe63d0b14cb5e811ae37fab40f74446
2016-06-20 17:50:40 +00:00
Jason Monk
b6af413f8b Fix focusability of battery history chart am: 9c6ab88bd7
am: b363eb89bc

Change-Id: Ibdb83d13677d9101264593e2220b9d18fc261fc9
2016-06-20 17:38:19 +00:00