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
2d1def707f
Merge \\"Add play icon to the gesture settings videos.\\" into nyc-mr1-dev am: 9ca0e6cc86
...
am: bdbd9e43d1
2016-06-21 19:07:11 +00:00
Doris Ling
bdbd9e43d1
Merge \"Add play icon to the gesture settings videos.\" into nyc-mr1-dev
...
am: 9ca0e6cc86
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
Dan Sandler
cfa1f803c7
Merge \\\"Show \\\"0\\\" instead of \\\"0 B\\\" in storage settings.\\\" into nyc-dev am: 87fcf9e95f am: 698fe0a9b0
...
am: 09c38bb326
2016-06-21 18:36:28 +00:00
Dan Sandler
29ebf7f779
Merge \\\"Show \\\"0\\\" instead of \\\"0 B\\\" in storage settings.\\\" into nyc-dev am: 87fcf9e95f am: 7df9a28fdb
...
am: 92e908b68e
2016-06-21 18:36:28 +00:00
Daniel Sandler
09c38bb326
Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am: 87fcf9e95f
...
am: 698fe0a9b0
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
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
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
2016-06-21 18:17:08 +00:00
Pavel Zhamaitsiak
646cb279b5
Merge \\"Hide WFC settings if WFC is not provisioned (and provisioning is required)\\" into nyc-mr1-dev am: 4f3a7589bc
...
am: 7fffd051fa
2016-06-21 18:12:07 +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
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
3b50d91ee9
Merge \\"Enable/disable support buttons based on operation hours.\\" into nyc-mr1-dev am: a00e3b78de
...
am: e4d1e73c87
2016-06-21 17:31:23 +00:00
Fan Zhang
e4d1e73c87
Merge \"Enable/disable support buttons based on operation hours.\" into nyc-mr1-dev
...
am: a00e3b78de
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
7a8b636de6
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: f315e2e6f0 -s ours am: 440199c6c4 -s ours
...
am: fc4fb60597
2016-06-21 17:05:21 +00:00
Bill Yi
fc4fb60597
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours
...
am: 440199c6c4
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
e5a3030957
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: f315e2e6f0 -s ours am: 672e1ddb14 -s ours
...
am: 9cfd92d7d8
2016-06-21 17:00:44 +00:00
Bill Yi
7d56ca0f98
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5903be35f4 -s ours
...
am: 475d022e59
2016-06-21 17:00:43 +00:00
Bill Yi
9cfd92d7d8
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours
...
am: 672e1ddb14
2016-06-21 16:58:10 +00:00
Bill Yi
475d022e59
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 5903be35f4
2016-06-21 16:58:09 +00:00
Bill Yi
440199c6c4
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: f315e2e6f0
2016-06-21 16:56:45 +00:00
Bill Yi
672e1ddb14
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: f315e2e6f0
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
TreeHugger Robot
f11d06991a
Merge "Import translations. DO NOT MERGE"
2016-06-21 16:53:16 +00:00
Sunny Goyal
bcfe8e8d95
Merge \\"Adding custom manifest shortcuts in Settings app\\" into nyc-mr1-dev am: 139fbb78b5
...
am: 6f38bd7620
2016-06-21 16:51:23 +00:00
Sunny Goyal
6f38bd7620
Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
...
am: 139fbb78b5
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
be7aebdb9c
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25 am: e341462a50
...
am: 3659d42b32
2016-06-21 16:03:42 +00:00
Zoltan Szatmary-Ban
3659d42b32
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
...
am: e341462a50
2016-06-21 16:00:35 +00:00
Zoltan Szatmary-Ban
cf945c47d2
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25 am: 63170fbf7a
...
am: 3b629c6918
2016-06-21 15:57:49 +00:00
Zoltan Szatmary-Ban
e341462a50
Fix non-app non-user preferences in Settings > Data usage
...
am: afea1cae25
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
2016-06-21 15:55:07 +00:00
Zoltan Szatmary-Ban
63170fbf7a
Fix non-app non-user preferences in Settings > Data usage
...
am: afea1cae25
2016-06-21 15:52:33 +00:00
Fan Zhang
881685d6d1
Merge \\"Log button taps in support tab.\\" into nyc-mr1-dev am: a2fe136837
...
am: 1b6d911793
2016-06-21 15:47:29 +00:00
Fan Zhang
1b6d911793
Merge \"Log button taps in support tab.\" into nyc-mr1-dev
...
am: a2fe136837
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
Robin Lee
140ad39fb0
Merge "Don't show always-on option connecting PPTP vpn"
2016-06-21 13:53:20 +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
