Commit Graph

15074 Commits

Author SHA1 Message Date
Tony Mak
f869df20c4 Merge \\"Disable instead of hiding add account preference\\" into nyc-mr1-dev am: 8738e406c8
am: c76f7fcba1

Change-Id: I5ad4443041ef51f420fa056b8dbcd9af9d8fc5a5
2016-07-15 03:51:06 +00:00
Tony Mak
c76f7fcba1 Merge \"Disable instead of hiding add account preference\" into nyc-mr1-dev
am: 8738e406c8

Change-Id: Ibe0bfa084e14dece83b19d4e62d50b96928b042a
2016-07-15 03:47:52 +00:00
Tony Mak
8738e406c8 Merge "Disable instead of hiding add account preference" into nyc-mr1-dev 2016-07-15 03:42:07 +00:00
Tony Mak
6ba9e15c4a Disallow user to block notification from OobConfig
Change-Id: I4680e5c5b596e81ac33d544d0d81de9df3b7587c
Fix: 29632126
2016-07-14 15:32:26 +08:00
Tony Mak
981e9a96dc Disable instead of hiding add account preference
Bug: 29236399
Change-Id: Ieb1af7f31a54b1502ae99682fc423e37c86a2353
2016-07-14 13:42:50 +08:00
Michael Wright
aacf55ab3f Color transforms are now color modes.
We've also standardized on a specific, enumerated set of modes, which
simplifies the code a bit.

Bug: 29044347
Change-Id: I621352954d42ad25f9969b7a88d53defe84dd3b4
2016-07-13 22:12:33 -07:00
Doris Ling
86c2c94521 Merge \\"Revert equal check in DashboardAdapter.setCondition().\\" into nyc-mr1-dev am: 3468853cef
am: 7072bd2f1c

Change-Id: I276a4b3d4ddfbf0f89b16f9d49657f685d7ed205
2016-07-14 03:46:56 +00:00
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
Wonsik Kim
52693ab0aa Refine fingerprint animation handling
Release stale SurfaceTexture and MediaPlayer when necessary.

Bug: 30104155
Change-Id: Ife5ba215fb962522cf007cd711a9329b4202cc39
2016-07-14 11:58:47 +09:00
Tony Mak
26e60afdf1 Merge \\"Hide Set Wallpaper in Settings suggestion if it is not allowed\\" into nyc-mr1-dev am: 1a8be1e372
am: 494fed5682

Change-Id: I34d7fc9602adaa3d78d1cc05069ac34d5bf7c6db
2016-07-14 01:48:33 +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
810a21843e Merge \\"Add content description to escalation card title.\\" into nyc-mr1-dev am: 31e5d5bb4b
am: 458024f52e

Change-Id: Iddab902a2077e4aece42c3536f2dbb537febdd4c
2016-07-14 00:01:21 +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
6cd15aa33d Merge \\"Cross fade escalation card when content changes.\\" into nyc-mr1-dev am: b10df69a84
am: 7d1ef4ca3c

Change-Id: I64c941be24fba33b7ce5087e83d71e4492a5b4ec
2016-07-13 19:57:09 +00: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
06890df24a Merge \\"Tweak layouts to make support UI look better.\\" into nyc-mr1-dev am: 8b47c12550
am: 060287a805

Change-Id: I37f654617bf210dd6601b2f6bfc23edc6e821880
2016-07-13 19:08:51 +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
Mark Salyzyn
4aaacb08e9 Merge \\\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\\" am: a1b40f0267 am: 455006c9ca am: 2e6a8bb8f8
am: d98dc9f70e

Change-Id: Id1d031f74f132f277397ca1f04c15f6aaae70b36
2016-07-13 18:26:01 +00:00
Doris Ling
89b315568a resolve merge conflicts of 161093b to master
Change-Id: I14c74be54ca216b1f1e369685516a821a94ab30a
2016-07-13 11:18:28 -07:00
Mark Salyzyn
d98dc9f70e Merge \\\"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\\\" am: a1b40f0267 am: 455006c9ca
am: 2e6a8bb8f8

Change-Id: I67e73fbe05e88580d41bae73436e53a325655634
2016-07-13 18:09:12 +00:00
Mark Salyzyn
455006c9ca Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"
am: a1b40f0267

Change-Id: I38e4c7756a2ea617053656558d8223458d898a28
2016-07-13 18:02:20 +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
Daniel Nishi
efd2761eea Merge \\"Log when the storage manager is toggled on and off.\\" into nyc-mr1-dev am: 3cd686d4a9
am: 6ae5203e7a

Change-Id: I3062b808d437592ef560af2b53f8f8217fd4c0e3
2016-07-13 16:47:28 +00:00
Daniel Nishi
6ae5203e7a Merge \"Log when the storage manager is toggled on and off.\" into nyc-mr1-dev
am: 3cd686d4a9

Change-Id: I94a22cadb4c142e5fabeb956d411a794e5c0032a
2016-07-13 16:35:34 +00:00
Daniel Nishi
3cd686d4a9 Merge "Log when the storage manager is toggled on and off." into nyc-mr1-dev 2016-07-13 16:26:06 +00:00
Mahaver Chopra
a708284946 Merge \\"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\\" into nyc-mr1-dev am: ec618dc585
am: fae757cb1c

Change-Id: Ie84f55e2bdda60224e828b52398880852577e9d8
2016-07-13 12:40:32 +00:00
Mahaver Chopra
fae757cb1c Merge \"Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED\" into nyc-mr1-dev
am: ec618dc585

Change-Id: Ide526f716b96a73635853d621bef61d09ff04425
2016-07-13 12:34:04 +00:00
Mahaver Chopra
ec618dc585 Merge "Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED" into nyc-mr1-dev 2016-07-13 12:27:03 +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
53d077cde2 Merge \\"Request support rules to refresh when account changes.\\" into nyc-mr1-dev am: 987eadbd4b
am: 85a11e7f82

Change-Id: If38d026fcdaf782b5ab95084710c03fd56a83b21
2016-07-13 01:29:44 +00: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
4b042ee3d7 Merge \\"Don\\'t show the Fingerprint suggestion if it is disabled.\\" into nyc-mr1-dev am: 8dc1a7340b
am: d2965dfe3d

Change-Id: I550f5d7dc541a87eba408c2bcbc059bd15bd3b56
2016-07-12 21:53:39 +00: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
TreeHugger Robot
8dc1a7340b Merge "Don't show the Fingerprint suggestion if it is disabled." into nyc-mr1-dev 2016-07-12 21:42:04 +00:00
Fan Zhang
af66ed8c20 Merge \\"Use app name as summary in default home app setting.\\" into nyc-mr1-dev am: 0fd709bf44
am: f32c1b77f5

Change-Id: Ia5cb092814fb535ebba414ac022c5fcdd019f64a
2016-07-12 21:36:24 +00:00
Fan Zhang
f32c1b77f5 Merge \"Use app name as summary in default home app setting.\" into nyc-mr1-dev
am: 0fd709bf44

Change-Id: Ie2ea62621d24f8c2d6867fb6b8f4c3b00c57333d
2016-07-12 21:33:06 +00:00
TreeHugger Robot
0fd709bf44 Merge "Use app name as summary in default home app setting." into nyc-mr1-dev 2016-07-12 21:26:11 +00:00
Daniel Nishi
2aa423dda6 Log when the storage manager is toggled on and off.
Bug: 30095915
Change-Id: I9fe16f842f2c2944582ec231803aa957573abead
2016-07-12 13:59:22 -07: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