Fan Zhang
121b4d04a5
Merge \\"Display operation hours when support is closed.\\" into nyc-mr1-dev am: c3a0a18f77
...
am: 6485952e26
Change-Id: Ia66d9982a4cbdd6b3b2d5d45766dcb0cb446a34a
2016-06-23 17:44:38 +00:00
Fan Zhang
b0052ef0b5
Merge \\"Bug fix: support tab doesn\\'t show offline UI initially.\\" into nyc-mr1-dev am: 2373aaafc6
...
am: 3cdd348434
Change-Id: I66041ea6397b11ad7be3ae948d1ec18a302410d9
2016-06-23 17:44:34 +00:00
Fan Zhang
6485952e26
Merge \"Display operation hours when support is closed.\" into nyc-mr1-dev
...
am: c3a0a18f77
Change-Id: I85feefab029eeb7e7101ec7f25e28d3653b07852
2016-06-23 17:38:23 +00:00
Fan Zhang
3cdd348434
Merge \"Bug fix: support tab doesn\'t show offline UI initially.\" into nyc-mr1-dev
...
am: 2373aaafc6
Change-Id: I226b76f8d69ff25327c9043609bb923a13feab7b
2016-06-23 17:38:20 +00:00
Fan Zhang
c3a0a18f77
Merge "Display operation hours when support is closed." into nyc-mr1-dev
2016-06-23 17:27:11 +00:00
Fan Zhang
2373aaafc6
Merge "Bug fix: support tab doesn't show offline UI initially." into nyc-mr1-dev
2016-06-23 17:25:22 +00:00
Fan Zhang
a8219fb1c1
Bug fix: support tab doesn't show offline UI initially.
...
Bug: 29601818
The support UI correctly monitors network state change after being
displayed, but it fails to set initial hasInternet flag. So we
manually refresh this flag as part of onResume.
Change-Id: Icbf3cca708a961390073cfa77ec08bec7dd4d82f
2016-06-23 08:38:00 -07:00
Fan Zhang
0bc42ab618
Display operation hours when support is closed.
...
Bug: 29105266
Change-Id: Id451b1aa820961fad4ece07fde5782a5aecaee68
2016-06-22 09:26:49 -07: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
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
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
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
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
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
ab2e0390a0
Log button taps in support tab.
...
Bug: 29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
2016-06-20 10:26:20 -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
37d4d0c80e
Use metrics defined by proto in new Settings tabs.
...
Bug: 28141203
Change-Id: Ia0c566f873f93e46203d19f35161bb98acc60a38
2016-06-16 16:24:20 -07:00
Fan Zhang
2c1e5b1ba5
Merge \\"Remove forum link from support tab.\\" into nyc-mr1-dev am: 1c6674dbb2
...
am: b7e08a4fc6
Change-Id: Iaf50fb0512aff53dd6d4cdebc9e6600ecadfd1e0
2016-06-15 16:25:27 +00:00
Fan Zhang
b7e08a4fc6
Merge \"Remove forum link from support tab.\" into nyc-mr1-dev
...
am: 1c6674dbb2
Change-Id: I35349cfef2f68057dbd80ea04a8851f5fc54860a
2016-06-15 16:17:20 +00:00
Fan Zhang
156453c0ad
Remove forum link from support tab.
...
Bug: 29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244
2016-06-14 13:01:45 -07:00
Fan Zhang
700a38625f
Merge \\"Support tab UI polish.\\" into nyc-mr1-dev am: cac9227e16
...
am: 26904db4bc
Change-Id: I9bfe9a2bf1d7d766cb7fbac10f5cfe5264e453e1
2016-06-14 19:33:35 +00:00
Fan Zhang
26904db4bc
Merge \"Support tab UI polish.\" into nyc-mr1-dev
...
am: cac9227e16
Change-Id: I64062459148a6fd38f223eef92cc1680e38423c9
2016-06-14 19:31:15 +00:00
Fan Zhang
cac9227e16
Merge "Support tab UI polish." into nyc-mr1-dev
2016-06-14 19:26:29 +00:00
Fan Zhang
31405d0023
Support tab UI polish.
...
Bug: 29107343
Bug: 29101595
1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.
Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c
2016-06-14 10:30:23 -07:00
Sunny Goyal
110d3485c9
Merge \\"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\\" into nyc-mr1-dev am: fef6234ebc
...
am: 4dae8c2769
Change-Id: Ifa4e98aeea2d7a4ecf641aee003892fa76d15d83
2016-06-14 17:06:14 +00:00
Sunny Goyal
4dae8c2769
Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev
...
am: fef6234ebc
Change-Id: I602f81cfeea807b3c63799eb7b9985e0053ed583
2016-06-14 17:00:56 +00:00
Sunny Goyal
0bf6f94c58
Changing the WallpaperSuggestionActivity to redirect to the actual
...
wallpaper picker component defined in the config.
Bug: 28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e
2016-06-14 09:44:10 -07:00
Jason Monk
718c84f121
resolve merge conflicts of 67e87fa to nyc-mr1-dev
...
Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178
2016-06-01 16:20:01 -04:00
Jason Monk
350a930c68
onResume -> onStart, onPause -> onStop
...
For SettingsActivity and DashboardSummary
Bug: 28896214
Change-Id: I235d5c82b04b1363bf4416acb5cf5fc1c4db704f
2016-06-01 13:45:25 -04:00
Jason Monk
e5e4a555e7
Merge "Fix crash from battery saver switch" into nyc-dev am: 371aec1e92 am: e3b9c3dd63
...
am: 362287567e
* commit '362287567e1b66421c9bbdf1fd1ca7ae7c547113':
Fix crash from battery saver switch
Change-Id: I01a71bf6f60c634baa2b4784dd757ca729b7075c
2016-05-26 18:02:56 +00:00
Jason Monk
e3b9c3dd63
Merge "Fix crash from battery saver switch" into nyc-dev
...
am: 371aec1e92
* commit '371aec1e92aa4b5cf6e4ed2b5f39faf180c17d1f':
Fix crash from battery saver switch
Change-Id: I0416b92dbc9b18a97c9d6d0617cba636e310690b
2016-05-26 17:53:41 +00:00
Jason Monk
e4d0ed502d
Fix crash from battery saver switch
...
Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash. Instead load
immediately for everything but the dashboard.
Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes: 28952354
2016-05-26 11:07:53 -04:00
Jason Monk
0fb88a1eb7
Don\'t update conditions on background threads am: 6cb280d146 am: 928dbe3462
...
am: 95fb0ae886
* commit '95fb0ae886d8752f2d83d711a2b06c0ab1b2f33e':
Don't update conditions on background threads
Change-Id: I35e155088e6d9eae76aa29970dfc2d05744fd053
2016-05-25 19:05:14 +00:00
Jason Monk
928dbe3462
Don\'t update conditions on background threads
...
am: 6cb280d146
* commit '6cb280d14641327b32378504544d125bbc3bcaf3':
Don't update conditions on background threads
Change-Id: I446e85dc5462e3c06a75e2e53f1990990bb06f48
2016-05-25 18:28:02 +00:00
Jason Monk
6cb280d146
Don't update conditions on background threads
...
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.
Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes: 28794277
2016-05-25 12:53:34 -04:00
Fan Zhang
f579cf9ae1
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev am: de188186d8
...
am: 9821904876
* commit '98219048769789a7904c840bf32806cf70f0d56f':
Display disclaimer dialog before starting support.
Change-Id: Ia973f79f522c627ec2e126a42392d00e5d0e371d
2016-05-20 00:16:29 +00:00
Fan Zhang
a2bd32b397
Display disclaimer dialog before starting support.
...
Bug: 28656426
Bug: 28141203
Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270
2016-05-19 12:15:38 -07:00
Rachel Zhang
55cd13f44a
Merge "Remove settings overflow menu" into nyc-mr1-dev am: 97a8db3c8a
...
am: f5239e1e7c
* commit 'f5239e1e7c2e665b821400c5e0ce5daa9e82c592':
Remove settings overflow menu
Change-Id: Ib58b8d2942cf2db0540faaf33315c72d3c4a8c00
2016-05-17 16:59:03 +00:00
Rachel Zhang
471815e4bd
Remove settings overflow menu
...
Bug: 28139684
Change-Id: I099af85878fde5f2317be312f979994fbbc87287
2016-05-16 13:43:51 -07:00
Adrian Roos
373060c2a3
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a am: 1d1ca8e590
...
am: 3b7eedabb8
* commit '3b7eedabb85f18229911a67d91864849532f8bba':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: Iadad066e04fde46b247634b9f2d36f472deb4285
2016-05-12 21:06:07 +00:00
Adrian Roos
1d1ca8e590
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
...
am: ef505d628a
* commit 'ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I5746a924564e8eb866b0c0e0a1e0205a38896f89
2016-05-12 20:59:47 +00:00
Adrian Roos
ef505d628a
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
2016-05-12 20:52:25 +00:00
Adrian Roos
059b0fa060
Allow DPMs to restrict Remote Input on Keyguard
...
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes: 26981262
2016-05-12 19:12:17 +00:00
Fan Zhang
c6b411d58a
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev am: f5746f9078
...
am: 1fb38d03bf
* commit '1fb38d03bf6c9ce43114f0ec9f20c07b6c93e3cc':
Update suggestion/support UI to use more negative space.
Change-Id: Ibfa15b9c1c8d8f3b29dd3c7b31cee03c9021af7b
2016-05-12 18:53:55 +00:00
Fan Zhang
50cde75ef7
Update suggestion/support UI to use more negative space.
...
Bug: 28435214
-- Tweaked layout and padding in suggestions and support tab.
-- Added support to show different text color in SlidingTabLayout.
Change-Id: If5d90ec5360e35565176aae7475e355c27fcef7c
2016-05-12 11:14:59 -07:00