Commit Graph

242 Commits

Author SHA1 Message Date
Doris Ling
7072bd2f1c Merge \"Revert equal check in DashboardAdapter.setCondition().\" into nyc-mr1-dev
am: 3468853cef

Change-Id: I136422e5b2dccf4f17ab5645bd6af48a1c47dc9a
2016-07-14 03:42:02 +00:00
Doris Ling
3468853cef Merge "Revert equal check in DashboardAdapter.setCondition()." into nyc-mr1-dev 2016-07-14 03:34:00 +00:00
Tony Mak
494fed5682 Merge \"Hide Set Wallpaper in Settings suggestion if it is not allowed\" into nyc-mr1-dev
am: 1a8be1e372

Change-Id: Ic8a85dbb4b654f6df0bad993a1cce986f60ab193
2016-07-14 01:38:16 +00:00
Tony Mak
1a8be1e372 Merge "Hide Set Wallpaper in Settings suggestion if it is not allowed" into nyc-mr1-dev 2016-07-14 01:22:52 +00:00
Fan Zhang
458024f52e Merge \"Add content description to escalation card title.\" into nyc-mr1-dev
am: 31e5d5bb4b

Change-Id: I990a9c8a0adc41b976fcaaf177b90a74c32d4be7
2016-07-13 23:36:52 +00:00
Doris Ling
08d34b6a99 Revert equal check in DashboardAdapter.setCondition().
1. Remove the equality check for the conditions list which causes
"Airplane mode is on" to be shown always even when airplane mode is
turned off.
2. Also add mIsShowingAll and mSuggestionMode to instance state.

Bug: 30055644
Change-Id: I0709e9a1b0139e80cdb834cb76a9334dce753e14
2016-07-13 16:17:13 -07:00
Fan Zhang
0bd87d71b8 Add content description to escalation card title.
Bug: 30079904

In strings like "We're here for you 24/7", to avoid talkback read 24/7
as 24/7ths, we need to provide a custom content description.

Change-Id: If51586d97a376e7a859658d7a6dc48108094ddc2
2016-07-13 13:47:04 -07:00
Fan Zhang
7d1ef4ca3c Merge \"Cross fade escalation card when content changes.\" into nyc-mr1-dev
am: b10df69a84

Change-Id: I2fe2f2ab2cad15e1ee60ba7dafb3ccd7fd349604
2016-07-13 19:51:35 +00:00
TreeHugger Robot
b10df69a84 Merge "Cross fade escalation card when content changes." into nyc-mr1-dev 2016-07-13 19:46:02 +00:00
Fan Zhang
060287a805 Merge \"Tweak layouts to make support UI look better.\" into nyc-mr1-dev
am: 8b47c12550

Change-Id: I29e31e40f60f160e26c1ec17afb4cb60cbe90b7a
2016-07-13 18:57:40 +00:00
TreeHugger Robot
8b47c12550 Merge "Tweak layouts to make support UI look better." into nyc-mr1-dev 2016-07-13 18:51:54 +00:00
Doris Ling
161093bb0a Merge \"Reduce the number of times that dataset changed is triggerd in DashboardAdapter\" into nyc-mr1-dev
am: 8c50ced07c

Change-Id: I0989b7f8e122d5221757b57b1866d536a1657ae3
2016-07-13 17:25:16 +00:00
Fan Zhang
5df6364d89 Cross fade escalation card when content changes.
Fixes: 30079520

Whenever escalation card needs to change content:
- Instead of rebuilding entire data set, rebuild just escalation data.
- Instead of notify entire data set change, only notify the position
  change for escalation card.
This triggers the cross-fade animation in RecyclerView's
DefaultItemAnimator.

Change-Id: Ia19593d852fa6a1c366aecf9330d8274d7295e85
2016-07-13 10:23:52 -07:00
Fan Zhang
55c6ea25f4 Tweak layouts to make support UI look better.
Fixes: 30087623

- Removed some padding and hide empty textviews.

Change-Id: Id8476aa3870d796c5f5a34c2f3fa6db34918691b
2016-07-13 10:19:56 -07:00
Doris Ling
8c50ced07c Merge "Reduce the number of times that dataset changed is triggerd in DashboardAdapter" into nyc-mr1-dev 2016-07-13 17:13:05 +00:00
Tony Mak
2c5a27dc7a Hide Set Wallpaper in Settings suggestion if it is not allowed
Change-Id: I8030389f3fe945c3df241f347d58b8da04622d9e
Fix: 30089761
2016-07-13 17:57:33 +08:00
Fan Zhang
85a11e7f82 Merge \"Request support rules to refresh when account changes.\" into nyc-mr1-dev
am: 987eadbd4b

Change-Id: I7ff6ead262c69d18b8a5fc746e58c1a62a23e68a
2016-07-13 01:25:45 +00:00
Doris Ling
b76de265a2 Reduce the number of times that dataset changed is triggerd in DashboardAdapter
1. Save the suggestion list and the category list into the instance
state so that it will be available on warm start, and avoid the need
to reload the data.
2. Add the condition list to the constructor parameters for
DashboardAdapter, so that it does not need to setConditions()
separately which will trigger notifyDataSetChanged()

Bug: 30055644
Change-Id: Ia04fa3a25b13d2dacf6baf5f412d662a595fb6dd
2016-07-12 18:02:22 -07:00
Fan Zhang
eadc7dc815 Request support rules to refresh when account changes.
Bug: 30079512

When account is added, operation rule can potentially change. Request a
refresh to make sure user sees the latest UI.

Change-Id: I89e9d97bec22d612ca3602d86cc63f8f06355a39
2016-07-12 16:42:40 -07:00
Daniel Nishi
d2965dfe3d Merge \"Don\'t show the Fingerprint suggestion if it is disabled.\" into nyc-mr1-dev
am: 8dc1a7340b

Change-Id: If6f0c6307b3c617b0c07c5cf9a69899ae893009c
2016-07-12 21:49:33 +00:00
Daniel Nishi
c9ec8c80bc Don't show the Fingerprint suggestion if it is disabled.
Bug: 27202317
Change-Id: I8e97e47f711961cf127fc2135dd06812236829b8
2016-07-12 13:11:19 -07:00
Fan Zhang
0e2c45b5df UI updates for support tab.
am: 48aab452cb

Change-Id: I7d2bb55979e6b2a4dfe944552fe9a50a184fe573
2016-07-08 19:21:26 +00:00
Fan Zhang
48aab452cb UI updates for support tab.
Fixes: 29999181
Fixes: 29397123

- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
  always avaiable.

Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4
2016-07-08 10:26:29 -07:00
Fan Zhang
caf4498597 Fix strings for support tab.
am: 4178710f3d

Change-Id: Iaf5c0945180fab00986827f03dd1bdf9b4c224eb
2016-07-07 15:37:23 +00:00
Fan Zhang
4178710f3d Fix strings for support tab.
Bug: 29105266

- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.

Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
2016-07-07 08:27:25 -07:00
Fan Zhang
5efd8009df Merge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev
am: a0eb2997a9

Change-Id: I7a0d7e8cf410e05e578690b6ece69d6489fb3d81
2016-07-06 20:56:03 +00:00
TreeHugger Robot
a0eb2997a9 Merge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev 2016-07-06 20:44:04 +00:00
Fan Zhang
afa4fff821 Merge \"Remove search in support tab.\" into nyc-mr1-dev
am: bae81b4a6f

Change-Id: I59e7b9dffd8c488397b6904928e6c56a4ad0664d
2016-07-06 20:14:46 +00:00
Fan Zhang
ece8ff63b6 Remove search in support tab.
Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
2016-07-06 09:54:07 -07:00
Fan Zhang
0e2e738400 Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev
am: eef9dbcdb9

Change-Id: I1d5d80d7c60b72f0cb4d8d9eb91679000f278f6d
2016-07-01 18:31:18 +00:00
Fan Zhang
a9f7016acd Add logging when click tollfree/tolled phone support button
Bug: 29105266
Change-Id: Ide67c74b6c072c937f97269ad33800cca68a672d
2016-07-01 11:18:13 -07:00
Fan Zhang
016bd60491 Update escalation cards layout and data binding.
Bug: 29397123

- Updated the UI for support escalation cards so different state have
  the same height and text/button shows up at roughly same place.
- Split data model for escalation cards from SupportData. The data and
  UI between escalation cards and support tiles are different enough
  that it no longer makes sense to share the same data object.

Change-Id: I328cc33961b9638e5e5fc2cad3ebf443991f4d0c
2016-06-30 13:57:22 -07:00
Fan Zhang
8ea45ff337 Merge \"Fix a bug where selected country is reset.\" into nyc-mr1-dev
am: 57824d5aaa

Change-Id: I1b5c64822a80b9cc493b47a4b7a37fb5a19cf3bb
2016-06-30 17:03:04 +00:00
TreeHugger Robot
57824d5aaa Merge "Fix a bug where selected country is reset." into nyc-mr1-dev 2016-06-30 16:51:55 +00:00
Fan Zhang
a05a1b15d8 Merge \"Update UI for support tab.\" into nyc-mr1-dev
am: 0293fb40f2

Change-Id: I2126800fbd52201ac25a150ec9e8acf66c0526b1
2016-06-30 15:28:43 +00:00
Fan Zhang
d89d60d9ca Update UI for support tab.
Bug: 29397123
Bug: 29832054

- Increase spinner dropdown width to contain country names.
- Reduce suggestion counter's right padding.
- Tweak paddings in travel abroad phone dialog.
- Update icon and text for help&feedback / tips&tricks.

Change-Id: Ide52c6f8198d1a13a0fdeb000d7cb9e8c03688ca
2016-06-29 10:02:09 -07:00
Fan Zhang
242a7ef1e8 Fix a bug where selected country is reset.
Bug: 29397123

Bug caused by a bad merge.

Change-Id: I6cf4ea8796f712b3d2d9354a9845e9e95eda69b9
2016-06-29 09:39:37 -07:00
Fan Zhang
0f38866528 Merge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hours_part4\' into nyc-mr1-dev
am: 734c550c59

Change-Id: If9d9c8e960fd526e0d6d6df5189ae71de4802421
2016-06-28 19:28:11 +00:00
TreeHugger Robot
734c550c59 Merge changes from topics 'offline_operation_hours_part5', 'offline_operation_hours_part4' into nyc-mr1-dev
* changes:
  Show a static title/summary if country doesn't have support
  By default select current country in support phone list.
2016-06-28 19:20:03 +00:00
Fan Zhang
2768793840 Merge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev
am: ab7a6cf828

Change-Id: I325c9dcb1469855d3273e42457ee0e0f3d62d8fa
2016-06-28 18:13:20 +00:00
Fan Zhang
45eb3c04b5 Merge \"Show tolled support number when click travel abroad.\" into nyc-mr1-dev
am: 106ff4ff0c

Change-Id: I60c628afcc5d790a22a6baf9f90f9564f06d6b51
2016-06-28 18:13:19 +00:00
Fan Zhang
ab7a6cf828 Merge "Show operation hours for selected country's support phone" into nyc-mr1-dev 2016-06-28 18:10:32 +00:00
Fan Zhang
106ff4ff0c Merge "Show tolled support number when click travel abroad." into nyc-mr1-dev 2016-06-28 18:07:52 +00:00
Fan Zhang
973d6d57f0 Merge \"Restore selected country when rotating screen.\" into nyc-mr1-dev
am: 53f5539b6b

Change-Id: Ie4e1578308005b2adae995f372dd0150529da781
2016-06-28 15:17:23 +00:00
Fan Zhang
53f5539b6b Merge "Restore selected country when rotating screen." into nyc-mr1-dev 2016-06-28 15:12:16 +00:00
Fan Zhang
2c9f35e98d Show a static title/summary if country doesn't have support
Bug: 29105266
Change-Id: I874fbb1172ab2faf9372362cf0e1f933046c621c
2016-06-27 17:38:03 -07:00
Fan Zhang
46da9be509 By default select current country in support phone list.
Bug: 29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
2016-06-27 17:37:58 -07:00
Fan Zhang
2736ace057 Show operation hours for selected country's support phone
Bug: 28827790
Change-Id: Idddaefa33cf1a128b70c517b1acb61a2b7bab288
2016-06-27 15:56:20 -07:00
Fan Zhang
3737fabda4 Show tolled support number when click travel abroad.
Bug: 29105266
Change-Id: I3020039bafe26e8a494075ad2f192dba07ab6dd0
2016-06-27 15:56:20 -07:00
Jason Monk
a7bb1b2f47 Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa
am: 77fc052dd7

Change-Id: If6470542c1fbf62dcacfef2cb6d858c18e18cfc6
2016-06-27 18:46:31 +00:00