Commit Graph

200 Commits

Author SHA1 Message Date
Andrew Sapperstein
ac384f47c5 Merge "Add list item to open tips & tricks." into nyc-mr1-dev am: 277b7a81bd
am: ebe454e32a

* commit 'ebe454e32af92ec37bf9dd6413378443e2645f5e':
  Add list item to open tips & tricks.

Change-Id: Ia7dac06f485b5ce5191e3952737824c96f8d1989
2016-05-10 22:06:15 +00:00
Jason Monk
2e2f19d2eb resolve merge conflicts of 0496ffa to master
Change-Id: I61589b7e9f1190e19d48dbb421541ebc2891ee82
2016-05-10 16:34:48 -04:00
TreeHugger Robot
277b7a81bd Merge "Add list item to open tips & tricks." into nyc-mr1-dev 2016-05-10 20:31:09 +00:00
Jason Monk
0496ffad87 Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev am: a50a14a23a
am: 4101ba4eb1

* commit '4101ba4eb1395988941f3f24bc2f502753036e2f':
  Make sure TileAdapter always has a SuggestionParser

Change-Id: Ic204cabd5cdbdd67f6bbdb53032a277da7fd34fa
2016-05-10 20:29:02 +00:00
Jason Monk
6e9867dcc9 Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev
am: a50a14a23a

* commit 'a50a14a23a4f57203d01489ddef607f46f485518':
  Make sure TileAdapter always has a SuggestionParser

Change-Id: I87ee80fa989079c554c60870b9ddc70d3b36c5e4
2016-05-10 20:26:22 +00:00
Andrew Sapperstein
49db9c38b5 Add list item to open tips & tricks.
Added to the more help list for now.

BUG: 28654701
Change-Id: Ia020c3ffb5ab42cb82ffa75834fa45d20f2a1e72
2016-05-10 12:08:47 -07:00
Jason Monk
a41a8d05ab Make sure TileAdapter always has a SuggestionParser
Since it expects to have one

Change-Id: Ic0dccd2271c011cf7dc877e341af5a8bfea90c37
Fixes: 28689801
2016-05-10 13:03:35 -04:00
Jason Monk
572b3c82fc Merge "Dashboard performance work" into nyc-dev am: 04b25af149 am: 96eedcfdd2
am: fc5f0d4d20

* commit 'fc5f0d4d20817112d7d8d101f245ba50d45728e8':
  Dashboard performance work

Change-Id: I5daad812baf80d27ea6cf097bea15065fa581a7b
2016-05-09 13:48:48 +00:00
Jason Monk
96eedcfdd2 Merge "Dashboard performance work" into nyc-dev
am: 04b25af149

* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
  Dashboard performance work

Change-Id: I41c9443c997428924b5ef6df2ad632c06bd416a8
2016-05-09 13:40:54 +00:00
Jason Monk
2386dfc18d Dashboard performance work
Push more stuff to backround threads (this will cause conditions/suggestions
to load slightly slower than normal content) and cache more info.

Fixes: 28613950
Bug: 28435146
Change-Id: I1080930e8f31c7f12a2d89f266bfd3236979cf40
2016-05-06 13:17:47 -04:00
Fan Zhang
08a6d43a31 Add estimate time under support options. am: be61a14fcd
am: e8fc10ff79

* commit 'e8fc10ff79a19aa8b7c303740ab4a26abd9db753':
  Add estimate time under support options.

Change-Id: Ifd226f015b01cc5cb2537a7bac01231fa970ac09
2016-05-05 18:54:01 +00:00
Rachel Zhang
94a16c9d10 Merge "Launch Help & Feedback" into nyc-mr1-dev am: 1529a875db
am: bc250c382b

* commit 'bc250c382bbadf36fe20fa819d9722296fb08064':
  Launch Help & Feedback

Change-Id: I568359105877d0b846874fb20fe7a763a124cac5
2016-05-05 18:13:20 +00:00
Fan Zhang
be61a14fcd Add estimate time under support options.
Bug: 28141203

- SupportFeatureProvider will provide a localized estimate string.
- Use a builder pattern to instantiate SupportData to avoid increasing
  constructor args.

Change-Id: I92e90cd57b4ef4e1d921f403801cfd5984ef6a3b
2016-05-05 11:06:08 -07:00
Rachel Zhang
1529a875db Merge "Launch Help & Feedback" into nyc-mr1-dev 2016-05-05 17:58:14 +00:00
Fan Zhang
1eef5f9445 Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev am: 00b127b134
am: aa21c1b07a

* commit 'aa21c1b07af088ac1d106ebad91016dd1fcc29ca':
  Bring escalation options UI closer to mock.

Change-Id: I7519fa058e1be86af37527e8c1ff9c4476120f6d
2016-05-04 18:45:59 +00:00
Fan Zhang
cd09151224 Bring escalation options UI closer to mock.
Bug: 28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
2016-05-04 08:58:00 -07:00
Jason Monk
30e2ab7a81 Merge "Fix leaks" into nyc-dev am: ea8ee68507 am: 639ed29bae
am: f239345b0c

* commit 'f239345b0c4de4e40e31f762855737508a576075':
  Fix leaks

Change-Id: Ibc8d921ac97b303e76438d011f487fae97267624
2016-05-03 19:48:43 +00:00
Jason Monk
f239345b0c Merge "Fix leaks" into nyc-dev am: ea8ee68507
am: 639ed29bae

* commit '639ed29bae86891616643d00ffe143639e9cbb41':
  Fix leaks

Change-Id: Ib37a585ad37575abe7ef04f3c7d4b3024210738e
2016-05-03 19:42:19 +00:00
Jason Monk
065f27b14b Merge "Fix leaks" into nyc-dev
am: ea8ee68507

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c
2016-05-03 19:39:59 +00:00
Jason Monk
ea8ee68507 Merge "Fix leaks" into nyc-dev 2016-05-03 19:36:34 +00:00
Jason Monk
4e8d3013a2 Fix leaks
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes: 28074995
2016-05-03 15:24:05 -04:00
Jason Monk
0d05f33739 Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 am: 508e93babd
am: 22ac2b749a

* commit '22ac2b749a43bf61295571d20c3ecee7ca0d26d9':
  Try to fix receiver crash

Change-Id: I4304d0147a856ba6bd767836cb8588e146cf4c60
2016-05-03 18:47:29 +00:00
Jason Monk
22ac2b749a Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6
am: 508e93babd

* commit '508e93babdab9cde97721670bbcd0fbc4a5a1e28':
  Try to fix receiver crash

Change-Id: I9f839090a913905358283f15a6930446209078c4
2016-05-03 18:44:38 +00:00
Jason Monk
bf96779cbf Merge "Try to fix receiver crash" into nyc-dev
am: 5a2d6800b6

* commit '5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
  Try to fix receiver crash

Change-Id: I3c2bb9113fbd9599450a011836881e91dbfd8270
2016-05-03 18:42:10 +00:00
Jason Monk
a8a029f8eb Try to fix receiver crash
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes: 28554650
2016-05-03 14:25:56 -04:00
Rachel Zhang
8088907360 Launch Help & Feedback
Bug: 28139684
Bug: 28141203
Change-Id: I9853fa5fd789cd6404dddfd9b00b7dc3afe73d91
2016-05-03 10:48:05 -07:00
Fan Zhang
c217ec8ef7 Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev am: ac74071630
am: e0fc6404a3

* commit 'e0fc6404a3b0d3858451f9e65efbf805fbc32740':
  Explicitly setAccount in the same way as setHasInternet.

Change-Id: I4196227ac087bcadfec1a20f969edc7dba2016b5
2016-05-02 17:09:39 +00:00
Fan Zhang
9502163f92 Explicitly setAccount in the same way as setHasInternet.
Bug: 28141203

This frees adapter from updating account and internet internally, and
allows refreshData() be private.

Change-Id: I8ccb4311c48c66222ee19e2d01b1c4943acdb0ee
2016-05-02 09:24:59 -07:00
Fan Zhang
dc5088bb9d Merge "Disable stable id in support adapter." into nyc-mr1-dev am: 7efc40797a
am: bbe5bbb453

* commit 'bbe5bbb453fb5a2b297c46edd7c0461e6d2c5f6d':
  Disable stable id in support adapter.

Change-Id: I09d945cb62c273e64ae8c23bc4edcdb1228f1b8b
2016-04-29 18:31:46 +00:00
Fan Zhang
ce0c6dd680 Disable stable id in support adapter.
Bug: 28141203
Change-Id: I8785b804e15e58b4885645bc72d68c2a3cacc692
2016-04-29 10:23:21 -07:00
Fan Zhang
0a121a79a8 Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev am: 050d94151f
am: e00703242b

* commit 'e00703242b9d355b1ce66d0a90d7a19f748bc342':
  Prompt sign-in when there is no account for support options

Change-Id: I663a620e3ee4175b5c0f5a33b4a5deac59c6d8fd
2016-04-29 15:59:28 +00:00
Fan Zhang
050d94151f Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev 2016-04-29 15:49:30 +00:00
Fan Zhang
a6c862caf6 Prompt sign-in when there is no account for support options
Bug: 28141203
Bug: 28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995
2016-04-28 14:40:07 -07:00
Jason Monk
b5829b0355 Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 am: db723c9
am: 9574c90

* commit '9574c9091bd182f4e89d9c725c6f0702968db803':
  Fix summary lifecycle

Change-Id: I82265dbc34460733cbfcd1c32d02c88d6037ae7c
2016-04-28 15:05:02 +00:00
Jason Monk
9574c9091b Merge "Fix summary lifecycle" into nyc-dev am: 6e51591
am: db723c9

* commit 'db723c92211b9a6a71a0431256e7615304459dbd':
  Fix summary lifecycle

Change-Id: I04c55c1e345cbabb0de89f134df88122069e897c
2016-04-28 15:01:37 +00:00
Jason Monk
c39a0fa7ce Merge "Fix summary lifecycle" into nyc-dev
am: 6e51591

* commit '6e5159185388ed97c5b1a8648c1c6f2396d124a2':
  Fix summary lifecycle

Change-Id: If5eb2ce64f152d37fc5b60c74ea2e2f28bd50a4f
2016-04-28 14:58:11 +00:00
Jason Monk
8d8de14905 Fix summary lifecycle
Once more and probably not for all

Don't let multiple listening state changes get queued, this can cause
rapid changes like listening->not listening->listening.  Also store
listening state on the worker thread now that we drop some state
messages and only notify summaries when there is a state change.

Change-Id: I93a5f364e9b35929f9088e044ebefd9be69740e6
Fixes: 28319383
2016-04-28 10:42:10 -04:00
Fan Zhang
1f8aea56f0 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev am: cd89d12
am: 8d52417

* commit '8d52417257160443c2d52afa9d74c8406f0c7515':
  Monitor connectivity change and display offline promo.

Change-Id: Ib8b034b739f7048e788fa4b292ec291143ffe629
2016-04-27 23:43:31 +00:00
Fan Zhang
cd89d12642 Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev 2016-04-27 20:42:38 +00:00
Clara Bayarri
a0ad1b5cf2 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 am: 03fb024
am: c8ab34c

* commit 'c8ab34c5e44608ecab00da342916933b50d47eb7':
  Fix Settings Condition expand button a11y label

Change-Id: Idf60d662db506c3c7089a413fff7ea29b7c0685c
2016-04-27 19:36:11 +00:00
Clara Bayarri
03fb0244d5 Merge "Fix Settings Condition expand button a11y label" into nyc-dev
am: 51b1e05

* commit '51b1e0515d64adf3e330437960546465c0f4c7d3':
  Fix Settings Condition expand button a11y label

Change-Id: I3ce32065454d5b5e0bf58954e03ff88b8e205a1a
2016-04-27 19:26:54 +00:00
Fan Zhang
2ddde4a928 Monitor connectivity change and display offline promo.
Bug: 28141203
Change-Id: I2af7cc3071d835092fba961ff59189f1fb295063
2016-04-27 12:21:46 -07:00
Fan Zhang
da8413b678 Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev am: 562f632
am: 5fee9ad

* commit '5fee9ade4609d620139be2f304b8de3db3a878ad':
  Add c2c and chat support when there is eligible account.

Change-Id: I9f7871bbdc263bfb6bbbcdbc0cb61e04e3f5b497
2016-04-27 18:28:45 +00:00
Fan Zhang
a9fa0059b2 Add c2c and chat support when there is eligible account.
Bug: 28141203
Bug: 28316618
Bug: 28316343

- Replaced hardcoded fragment layout with a RecyclerView. The old layout
  was essentially building a list manually.
- Tweaked layout to look better.
- Hide escalation cards when there is no account. Show cards when
  there is at least 1 account.
- Request an intent to start specified support type when card is
  clicked.
- Monitor account changes so we can hide/show escalation cards when
  add/remove account.

Change-Id: Ie48158b85ade1363a41817cc88b1193e0aef87ae
2016-04-27 09:06:17 -07:00
Clara Bayarri
58440b2801 Fix Settings Condition expand button a11y label
Bug: 27276008
Change-Id: Ie62ed8a73b300948f053b5d35f344bce3b63869a
2016-04-27 16:54:22 +01:00
Jason Monk
fed8f020ff Merge "Attempt to fix receiver registering problems" into nyc-dev am: 8dbc166353 am: 5fddbcd846
am: 9e10f10a4f

* commit '9e10f10a4f4414a07caf31b171a6a409544fe352':
  Attempt to fix receiver registering problems

Change-Id: I01d068cdd896a424edea4774c4d0ce7f6b70b585
2016-04-22 16:13:42 +00:00
Jason Monk
5fddbcd846 Merge "Attempt to fix receiver registering problems" into nyc-dev
am: 8dbc166353

* commit '8dbc16635341e7c52454d3faf806dc228502f265':
  Attempt to fix receiver registering problems

Change-Id: I36fd2eba3c451a3c509ea0e5da9611a91af239e6
2016-04-22 16:08:55 +00:00
Jason Monk
8b986f5f73 Attempt to fix receiver registering problems
When in doubt, post to main thread.

Also clean up the listening state just in case there were any
doubts about it.

Change-Id: I9ab85781f38b0f694dc46ed5a953506ef10c5778
Fixes: 28319383 (Fingers crossed)
2016-04-22 11:40:13 -04:00
Fan Zhang
b31f7562ff Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev am: dd2797d3ef
am: ac42fbcfec

* commit 'ac42fbcfec708562060fd9befa729825fe400948':
  Open Help forum in browser when click 'Forum' button.

Change-Id: If2efcafb649f105a0ac9f95e7d466c552f3a5149
2016-04-21 18:50:34 +00:00
Jason Monk
fa812a5e48 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9 am: 2424d1dc04
am: f1a78a1264

* commit 'f1a78a1264c4cc908f79a2259f57848147d512a5':
  Fix summary loader lifecycle

Change-Id: Iec4a09103f6b07f38c8082ae1dee362dd3c4c9e1
2016-04-21 18:34:46 +00:00