Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update views when next slice is null" into pi-dev

Browse Source 
am: 88e264576a

Change-Id: I51146ff0981c0d11df251aff373ffafa5273b80e
This commit is contained in:
Lucas Dupin
2018-05-03 18:27:45 -07:00
committed by android-build-merger
parent c34fb2b13e 88e264576a
commit 5ae43b4e39
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
View File

@@ -145,17 +145,13 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
} }
private void showSlice() { private void showSlice() {
if (mPulsing) { if (mPulsing || mSlice == null) {
mTitle.setVisibility(GONE); mTitle.setVisibility(GONE);
mRow.setVisibility(GONE); mRow.setVisibility(GONE);
mContentChangeListener.accept(getLayoutTransition() != null); mContentChangeListener.accept(getLayoutTransition() != null);
return; return;
} }
if (mSlice == null) {
return;
}
ListContent lc = new ListContent(getContext(), mSlice); ListContent lc = new ListContent(getContext(), mSlice);
mHasHeader = lc.hasHeader(); mHasHeader = lc.hasHeader();
List<SliceItem> subItems = lc.getRowItems(); List<SliceItem> subItems = lc.getRowItems();

22
packages/SystemUI/tests/src/com/android/keyguard/KeyguardSliceViewTest.java
View File

@@ -21,9 +21,6 @@ import android.test.suitebuilder.annotation.SmallTest;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper.RunWithLooper; import android.testing.TestableLooper.RunWithLooper;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.ViewGroup;
import com.android.systemui.SysuiTestCase; import com.android.systemui.SysuiTestCase;
import com.android.systemui.keyguard.KeyguardSliceProvider; import com.android.systemui.keyguard.KeyguardSliceProvider;
@@ -35,6 +32,7 @@ import org.junit.runner.RunWith;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.concurrent.atomic.AtomicBoolean;
import androidx.slice.SliceProvider; import androidx.slice.SliceProvider;
import androidx.slice.SliceSpecs; import androidx.slice.SliceSpecs;
@@ -58,12 +56,24 @@ public class KeyguardSliceViewTest extends SysuiTestCase {
@Test @Test
public void showSlice_notifiesListener() { public void showSlice_notifiesListener() {
ListBuilder builder = new ListBuilder(getContext(), mSliceUri); ListBuilder builder = new ListBuilder(getContext(), mSliceUri);
boolean[] notified = {false}; AtomicBoolean notified = new AtomicBoolean();
mKeyguardSliceView.setContentChangeListener((hasHeader)-> { mKeyguardSliceView.setContentChangeListener((hasHeader)-> {
notified[0] = true; notified.set(true);
}); });
mKeyguardSliceView.onChanged(builder.build()); mKeyguardSliceView.onChanged(builder.build());
Assert.assertTrue("Listener should be notified about slice changes.", notified[0]); Assert.assertTrue("Listener should be notified about slice changes.",
notified.get());
}
@Test
public void showSlice_emptySliceNotifiesListener() {
AtomicBoolean notified = new AtomicBoolean();
mKeyguardSliceView.setContentChangeListener((hasHeader)-> {
notified.set(true);
});
mKeyguardSliceView.onChanged(null);
Assert.assertTrue("Listener should be notified about slice changes.",
notified.get());
} }
@Test @Test