PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689 am: 68bac97932 am: 207b456da5 am: 7a1047f75c

Browse Source 
Change-Id: If7f23848179ffdf0e944beed328a8db2f95d74ed
This commit is contained in:
Julia Reynolds
2020-05-16 03:40:11 +00:00
committed by Automerger Merge Worker
parent bba38daac3 7a1047f75c
commit 123bcc41c9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/conversation_onboarding.xml
View File

@@ -15,10 +15,12 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/onboarding"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:visibility="gone"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView

8
src/com/android/settings/notification/app/NoConversationsPreferenceController.java
View File

@@ -19,13 +19,14 @@ package com.android.settings.notification.app;
import android.content.Context; import android.content.Context;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.service.notification.ConversationChannelWrapper; import android.service.notification.ConversationChannelWrapper;
import android.view.View;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.settings.R;
import com.android.settings.notification.NotificationBackend; import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.widget.LayoutPreference;
import java.util.Collections;
import java.util.List; import java.util.List;
public class NoConversationsPreferenceController extends ConversationListPreferenceController { public class NoConversationsPreferenceController extends ConversationListPreferenceController {
@@ -56,6 +57,7 @@ public class NoConversationsPreferenceController extends ConversationListPrefere
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
LayoutPreference pref = (LayoutPreference) preference;
// Load conversations // Load conversations
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@Override @Override
@@ -69,6 +71,8 @@ public class NoConversationsPreferenceController extends ConversationListPrefere
if (mContext == null) { if (mContext == null) {
return; return;
} }
pref.findViewById(R.id.onboarding).setVisibility(mConversations.size() == 0
? View.VISIBLE : View.GONE);
preference.setVisible(mConversations.size() == 0); preference.setVisible(mConversations.size() == 0);
} }
}.execute(); }.execute();