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

Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev

Browse Source
This commit is contained in:
Alan Viverette
2018-03-16 13:53:46 +00:00
committed by Android (Google) Code Review
parent e90248c00e e893588f19
commit 259dd151f4
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/slice/SliceSpec.java
View File

@@ -89,7 +89,7 @@ public final class SliceSpec implements Parcelable {
* *
* @param candidate candidate format of data. * @param candidate candidate format of data.
* @return true if versions are compatible. * @return true if versions are compatible.
* @see androidx.app.slice.widget.SliceView * @see androidx.slice.widget.SliceView
*/ */
public boolean canRender(@NonNull SliceSpec candidate) { public boolean canRender(@NonNull SliceSpec candidate) {
if (!mType.equals(candidate.mType)) return false; if (!mType.equals(candidate.mType)) return false;

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

@@ -47,12 +47,12 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import androidx.app.slice.Slice; import androidx.slice.Slice;
import androidx.app.slice.SliceItem; import androidx.slice.SliceItem;
import androidx.app.slice.core.SliceQuery; import androidx.slice.core.SliceQuery;
import androidx.app.slice.widget.ListContent; import androidx.slice.widget.ListContent;
import androidx.app.slice.widget.RowContent; import androidx.slice.widget.RowContent;
import androidx.app.slice.widget.SliceLiveData; import androidx.slice.widget.SliceLiveData;
/** /**
* View visible under the clock on the lock screen and AoD. * View visible under the clock on the lock screen and AoD.
@@ -117,7 +117,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
private void showSlice(Slice slice) { private void showSlice(Slice slice) {
ListContent lc = new ListContent(slice); ListContent lc = new ListContent(getContext(), slice);
mHasHeader = lc.hasHeader(); mHasHeader = lc.hasHeader();
List<SliceItem> subItems = lc.getRowItems(); List<SliceItem> subItems = lc.getRowItems();
if (!mHasHeader) { if (!mHasHeader) {
@@ -125,7 +125,8 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
} else { } else {
mTitle.setVisibility(VISIBLE); mTitle.setVisibility(VISIBLE);
// If there's a header it'll be the first subitem // If there's a header it'll be the first subitem
RowContent header = new RowContent(subItems.get(0), true /* showStartItem */); RowContent header = new RowContent(getContext(), subItems.get(0),
true /* showStartItem */);
SliceItem mainTitle = header.getTitleItem(); SliceItem mainTitle = header.getTitleItem();
CharSequence title = mainTitle != null ? mainTitle.getText() : null; CharSequence title = mainTitle != null ? mainTitle.getText() : null;
mTitle.setText(title); mTitle.setText(title);
@@ -149,7 +150,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
final int startIndex = mHasHeader ? 1 : 0; // First item is header; skip it final int startIndex = mHasHeader ? 1 : 0; // First item is header; skip it
for (int i = startIndex; i < subItemsCount; i++) { for (int i = startIndex; i < subItemsCount; i++) {
SliceItem item = subItems.get(i); SliceItem item = subItems.get(i);
RowContent rc = new RowContent(item, true /* showStartItem */); RowContent rc = new RowContent(getContext(), item, true /* showStartItem */);
final Uri itemTag = item.getSlice().getUri(); final Uri itemTag = item.getSlice().getUri();
// Try to reuse the view if already exists in the layout // Try to reuse the view if already exists in the layout
KeyguardSliceButton button = mRow.findViewWithTag(itemTag); KeyguardSliceButton button = mRow.findViewWithTag(itemTag);

8
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java
View File

@@ -40,10 +40,10 @@ import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import androidx.app.slice.Slice; import androidx.slice.Slice;
import androidx.app.slice.SliceProvider; import androidx.slice.SliceProvider;
import androidx.app.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder;
import androidx.app.slice.builders.ListBuilder.RowBuilder; import androidx.slice.builders.ListBuilder.RowBuilder;
/** /**
* Simple Slice provider that shows the current date. * Simple Slice provider that shows the current date.

10
packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardSliceProviderTest.java
View File

@@ -21,7 +21,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import androidx.app.slice.Slice; import androidx.slice.Slice;
import android.app.AlarmManager; import android.app.AlarmManager;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -45,10 +45,10 @@ import org.mockito.MockitoAnnotations;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import androidx.app.slice.SliceItem; import androidx.slice.SliceItem;
import androidx.app.slice.SliceProvider; import androidx.slice.SliceProvider;
import androidx.app.slice.SliceSpecs; import androidx.slice.SliceSpecs;
import androidx.app.slice.core.SliceQuery; import androidx.slice.core.SliceQuery;
@SmallTest @SmallTest
@RunWith(AndroidTestingRunner.class) @RunWith(AndroidTestingRunner.class)