Commit Graph

13254 Commits

Author SHA1 Message Date
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

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
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
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
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

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
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
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
Robin Lee
ca75deb7af Don't show always-on option connecting PPTP vpn
Support for this kind has been taken out so it shouldn't be an option
when connecting (it's already not an option when editing).

Bug: 28807474
Change-Id: Id3e7be390c6813d091e7f897ac82aaf29042beb8
2016-06-21 12:24:33 +01: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
Julia Reynolds
8dc40b87a7 Merge \\\"Fix NPE printing notification actions.\\\" into nyc-dev am: 43b04bcc7d am: 018444ab61
am: 4606b359e9

Change-Id: I221d2967735e7867969bd5aa038f935168dc25e3
2016-06-20 19:20:17 +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
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
Fan Zhang
a659b1110a Merge \\"Add a \\"Do not show\\" checkbox in support disclaimer dialog.\\" into nyc-mr1-dev am: d04b49649e
am: 461b286de7

Change-Id: I7e06d1fe4be7d74b5a330be164d57f253b1a511f
2016-06-20 17:36:22 +00:00
Fan Zhang
ab2e0390a0 Log button taps in support tab.
Bug: 29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
2016-06-20 10:26:20 -07:00
Fan Zhang
461b286de7 Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
am: d04b49649e

Change-Id: I25ff49cb0ce6ab6cb4cfb35aef254d3881e343e1
2016-06-20 17:25:45 +00:00
Fan Zhang
d04b49649e Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev 2016-06-20 16:35:52 +00:00
Julia Reynolds
9bcc04c5db Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025
2016-06-20 10:23:44 -04:00
Meng Wang
ffb4f8a058 Merge \\"Hide \\'Update Emergecy Address\\' preference w/o carrier support\\" into nyc-mr1-dev am: 2a817d97fe
am: 8008dee36c

Change-Id: I5551238b5fc0eee189c0183aec7d7addacad678c
2016-06-18 04:15:55 +00:00
Meng Wang
8008dee36c Merge \"Hide \'Update Emergecy Address\' preference w/o carrier support\" into nyc-mr1-dev
am: 2a817d97fe

Change-Id: Iccf8008b7a818bf8327e8e53632326dd0dc41982
2016-06-18 04:12:40 +00:00
TreeHugger Robot
2a817d97fe Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev 2016-06-18 04:02:49 +00:00
Nathan Harold
12e1f55e92 Add Debug Toggles for Video and WiFI Calling Provisioning
-Add a debug toggle for Video Calling Provisioning
-Add a debug toggle for WiFi Calling Provisioning

Change-Id: I0cf3861ceabda48295181347b8997a2c8212de27
2016-06-17 19:09:33 -07:00
Doris Ling
f5cecb08fb Add play icon to the gesture settings videos.
1. Add a play button icon to show on top of the gesture videos when the
video is not playing.
2. Dynamically split the gesture video and description text in half
instead of using the hard coded value.
3. Hide the video view if animation is not available.
4. Delay removing the animation preview till the video starts drawing on
the surface texture.

Bug: 28565958
Change-Id: I8b954828d16286014404172d29efa4d2e00432b3
2016-06-17 17:53:35 -07:00
Fan Zhang
39d2e1f916 resolve merge conflicts of 057f4ae to master
Change-Id: I609b04b174195b2396ee5918990b03d737ad0067
2016-06-17 15:40:48 -07:00
Fan Zhang
057f4ae6cc Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
am: b2728f51fb

Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea
2016-06-17 20:20:54 +00:00
Fan Zhang
b2728f51fb Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev 2016-06-17 20:15:48 +00:00
Fan Zhang
0beb695999 Add a "Do not show" checkbox in support disclaimer dialog.
Bug: 28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
2016-06-17 12:56:35 -07:00