Merge "Make TouchInteractionService direct boot aware" into ub-launcher3-master
diff --git a/go/quickstep/res/layout/icon_recents_root_view.xml b/go/quickstep/res/layout/icon_recents_root_view.xml
index 82d5890..6c50950 100644
--- a/go/quickstep/res/layout/icon_recents_root_view.xml
+++ b/go/quickstep/res/layout/icon_recents_root_view.xml
@@ -18,13 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center">
- <!-- TODO(114136250): Remove this temporary placeholder view for Go recents -->
- <TextView
+ android:orientation="vertical">
+ <androidx.recyclerview.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/recent_task_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center"
- android:text="Stub!"
- android:textSize="40sp"/>
+ android:scrollbars="none"/>
</com.android.quickstep.views.IconRecentsView>
\ No newline at end of file
diff --git a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
index 00415fe..15da10c 100644
--- a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
+++ b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
@@ -15,12 +15,19 @@
*/
package com.android.quickstep.views;
+import static androidx.recyclerview.widget.LinearLayoutManager.VERTICAL;
+
import android.content.Context;
import android.util.AttributeSet;
import android.util.FloatProperty;
import android.view.ViewDebug;
import android.widget.FrameLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.launcher3.R;
+import com.android.quickstep.RecentsModel;
import com.android.quickstep.TaskAdapter;
import com.android.systemui.shared.recents.model.Task;
@@ -72,19 +79,25 @@
// TODO: Write a recents task list observer that creates/updates tasks and signals task adapter.
private static final ArrayList<Task> DUMMY_TASK_LIST = new ArrayList<>();
+ private final Context mContext;
private float mTranslationYFactor;
private TaskAdapter mTaskAdapter;
+ private RecyclerView mTaskRecyclerView;
public IconRecentsView(Context context, AttributeSet attrs) {
super(context, attrs);
+ mContext = context;
}
@Override
protected void onFinishInflate() {
super.onFinishInflate();
mTaskAdapter = new TaskAdapter(DUMMY_TASK_LIST);
- // TODO: Hook task adapter up to recycler view.
+ mTaskRecyclerView = findViewById(R.id.recent_task_recycler_view);
+ mTaskRecyclerView.setAdapter(mTaskAdapter);
+ mTaskRecyclerView.setLayoutManager(
+ new LinearLayoutManager(mContext, VERTICAL, true /* reverseLayout */));
}
public void setTranslationYFactor(float translationFactor) {
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f0955b3..252cae1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -126,7 +126,7 @@
<style name="WidgetContainerTheme.Dark" />
- <style name="FastScrollerPopup" >
+ <style name="FastScrollerPopup" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:layout_width">wrap_content</item>
<item name="android:minWidth">@dimen/fastscroll_popup_width</item>
<item name="android:layout_height">@dimen/fastscroll_popup_height</item>
@@ -142,7 +142,7 @@
</style>
<!-- Base theme for BubbleTextView and sub classes -->
- <style name="BaseIcon">
+ <style name="BaseIcon" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center</item>
@@ -150,7 +150,6 @@
<item name="android:gravity">center_horizontal</item>
<item name="android:lines">1</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
- <item name="android:fontFamily">sans-serif-condensed</item>
<item name="android:defaultFocusHighlightEnabled">false</item>
<!-- No shadows in the base theme -->
@@ -158,7 +157,7 @@
</style>
<!-- Icon displayed on the worksapce -->
- <style name="BaseIcon.Workspace">
+ <style name="BaseIcon.Workspace" >
<item name="android:shadowRadius">2.0</item>
<item name="android:shadowColor">?attr/workspaceShadowColor</item>
<item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
@@ -190,9 +189,7 @@
<style name="DropTargetButton" parent="DropTargetButtonBase" />
- <style name="TextTitle">
- <item name="android:fontFamily">sans-serif</item>
- </style>
+ <style name="TextTitle" parent="@android:style/TextAppearance.DeviceDefault" />
<style name="AllAppsEmptySearchBackground">
<item name="android:colorPrimary">#E0E0E0</item>