NotificationViewWrapper: Fix crash for custom views

Bug: 36430936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
Change-Id: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
Merged-In: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
This commit is contained in:
Adrian Roos
2017-04-04 17:22:03 -07:00
parent 456e005a6d
commit 7c68e29171
3 changed files with 53 additions and 2 deletions

View File

@@ -669,7 +669,7 @@ public class StatusBarIconView extends AnimatedImageView {
}
public void setDark(boolean dark, boolean fade, long delay) {
mDozer.setImageDark(this, dark, fade, delay, mIconColor != NO_COLOR);
mDozer.setImageDark(this, dark, fade, delay, mIconColor == NO_COLOR);
mDozer.setIntensityDark(f -> {
mDarkAmount = f;
updateDecorColor();

View File

@@ -69,7 +69,7 @@ public abstract class NotificationViewWrapper implements TransformableView {
}
protected NotificationDozeHelper createDozer(Context ctx) {
return new NotificationIconDozeHelper(mView.getContext());
return new NotificationDozeHelper();
}
protected NotificationDozeHelper getDozer() {

View File

@@ -0,0 +1,51 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.systemui.statusbar.notification;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class NotificationViewWrapperTest {
private Context mContext;
@Before
public void setUp() throws Exception {
mContext = InstrumentationRegistry.getTargetContext();
}
@Test
public void constructor_doesntUseViewContext() throws Exception {
new TestableNotificationViewWrapper(mContext, new View(null /* context */), null /* row */);
}
static class TestableNotificationViewWrapper extends NotificationViewWrapper {
protected TestableNotificationViewWrapper(Context ctx, View view,
ExpandableNotificationRow row) {
super(ctx, view, row);
}
}
}