Commit Graph

29364 Commits

Author SHA1 Message Date
Jason Monk
433b6f79f2 Merge \\\"Update battery content descriptions with labels\\\" into nyc-dev am: 2a6b3d4db1 am: 29e4b2bc30
am: a7bb4c297a

Change-Id: Id4967bafafc7137f5644c603a7f231d876416db9
2016-06-22 13:44:38 +00:00
Jason Monk
a7bb4c297a Merge \\"Update battery content descriptions with labels\\" into nyc-dev am: 2a6b3d4db1
am: 29e4b2bc30

Change-Id: I018d46e214d2a56ecc0fca5b089bcd81dc6c7c41
2016-06-22 13:38:39 +00:00
Jason Monk
29e4b2bc30 Merge \"Update battery content descriptions with labels\" into nyc-dev
am: 2a6b3d4db1

Change-Id: I0e81816f4eb2e99b10d4cbb46d97f0a370159a6c
2016-06-22 13:32:23 +00:00
Jason Monk
2a6b3d4db1 Merge "Update battery content descriptions with labels" into nyc-dev 2016-06-22 13:22:45 +00:00
Andrew Sapperstein
084322e4ee Merge \\"Update Settings to use DeviceDefault.Settings.\\" into nyc-mr1-dev am: 70ff5f8fa1
am: 61c34c0556

Change-Id: I765efb2be73d4791cac1f53d491efb533bbbe20e
2016-06-22 00:55:25 +00:00
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
Andrew Sapperstein
70ff5f8fa1 Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev 2016-06-21 23:02:13 +00:00
Doris Ling
2d1def707f Merge \\"Add play icon to the gesture settings videos.\\" into nyc-mr1-dev am: 9ca0e6cc86
am: bdbd9e43d1

Change-Id: Icf9183067c66f8cb69a4c5804a62d3b0d0dd5f75
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

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
Dan Sandler
cfa1f803c7 Merge \\\"Show \\\"0\\\" instead of \\\"0 B\\\" in storage settings.\\\" into nyc-dev am: 87fcf9e95f am: 698fe0a9b0
am: 09c38bb326

Change-Id: Ia41909506c8db8e9277a7edac1cd88cad83eecf9
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

Change-Id: I6a5fd83689308b3dd3e174f0e046274cf478283d
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

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
Pavel Zhamaitsiak
646cb279b5 Merge \\"Hide WFC settings if WFC is not provisioned (and provisioning is required)\\" into nyc-mr1-dev am: 4f3a7589bc
am: 7fffd051fa

Change-Id: Ia77035148f6f3784fee1109345043f5cbb1c1db2
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

Change-Id: Id9a51ea55922879c2776964d7a0d3c7a3ad8877b
2016-06-21 18:09:07 +00: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

Change-Id: I546c045c59316872907b41143a10c9482eca6e6a
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

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
7a8b636de6 Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: f315e2e6f0 -s ours am: 440199c6c4 -s ours
am: fc4fb60597  -s ours

Change-Id: I3c7e9d0f399cc297a6b3c98eb1e9cea4ae66d623
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  -s ours

Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef
2016-06-21 17:02:49 +00:00
Bill Yi
e5a3030957 Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: f315e2e6f0 -s ours am: 672e1ddb14 -s ours
am: 9cfd92d7d8  -s ours

Change-Id: Ib34f4017ca1d32e378b29ff3dc1946b45680015c
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  -s ours

Change-Id: I2cc84ec544535997ae9d681d3cac49b8d7422dee
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  -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
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

Change-Id: I0b611e0488a0a51be8eba329af166eb5f9c6d132
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

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
be7aebdb9c Fix non-app non-user preferences in Settings > Data usage am: afea1cae25 am: e341462a50
am: 3659d42b32

Change-Id: I9b408ba6e2bcfc02518355a7b46280723136b5a7
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

Change-Id: Idc9d5d2381b7c33cedc6b3d1e8bac1776b3ab1e9
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

Change-Id: Ib67f9492229f31332dc4b6bb46b3146be2928d17
2016-06-21 15:57:49 +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
881685d6d1 Merge \\"Log button taps in support tab.\\" into nyc-mr1-dev am: a2fe136837
am: 1b6d911793

Change-Id: Icf008237b170a8db73a97390ec43827ab12a72f6
2016-06-21 15:47:29 +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
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