Refine layouts for large screen

- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
  of being highlighted
- Add an interface to support dynamic split layout for suggestion cards

Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
This commit is contained in:
Jason Chiu
2022-03-24 16:58:31 +08:00
parent c4c923d1eb
commit 680fce3acd
17 changed files with 441 additions and 98 deletions

View File

@@ -27,6 +27,8 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -44,12 +46,13 @@ import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.support.SupportPreferenceController;
import com.android.settings.widget.HomepagePreference;
import com.android.settings.widget.HomepagePreferenceLayoutHelper.HomepagePreferenceLayout;
import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.search.SearchIndexable;
@SearchIndexable(forTarget = MOBILE)
public class TopLevelSettings extends DashboardFragment implements
public class TopLevelSettings extends DashboardFragment implements SplitLayoutListener,
PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
private static final String TAG = "TopLevelSettings";
@@ -58,6 +61,7 @@ public class TopLevelSettings extends DashboardFragment implements
private boolean mIsEmbeddingActivityEnabled;
private TopLevelHighlightMixin mHighlightMixin;
private int mPaddingHorizontal;
private boolean mScrollNeeded = true;
private boolean mFirstStarted = true;
@@ -177,23 +181,13 @@ public class TopLevelSettings extends DashboardFragment implements
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
super.onCreatePreferences(savedInstanceState, rootKey);
final PreferenceScreen screen = getPreferenceScreen();
if (screen == null) {
return;
}
// Tint the homepage icons
final int tintColor = Utils.getHomepageIconColor(getContext());
final int count = screen.getPreferenceCount();
for (int i = 0; i < count; i++) {
final Preference preference = screen.getPreference(i);
if (preference == null) {
break;
}
final Drawable icon = preference.getIcon();
int tintColor = Utils.getHomepageIconColor(getContext());
iteratePreferences(preference -> {
Drawable icon = preference.getIcon();
if (icon != null) {
icon.setTint(tintColor);
}
}
});
}
@Override
@@ -202,6 +196,15 @@ public class TopLevelSettings extends DashboardFragment implements
highlightPreferenceIfNeeded();
}
@Override
public void onSplitLayoutChanged(boolean isRegularLayout) {
iteratePreferences(preference -> {
if (preference instanceof HomepagePreferenceLayout) {
((HomepagePreferenceLayout) preference).getHelper().setIconVisible(isRegularLayout);
}
});
}
@Override
public void highlightPreferenceIfNeeded() {
if (mHighlightMixin != null) {
@@ -209,6 +212,52 @@ public class TopLevelSettings extends DashboardFragment implements
}
}
@Override
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
Bundle savedInstanceState) {
RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent,
savedInstanceState);
recyclerView.setPadding(mPaddingHorizontal, 0, mPaddingHorizontal, 0);
return recyclerView;
}
/** Sets the horizontal padding */
public void setPaddingHorizontal(int padding) {
mPaddingHorizontal = padding;
RecyclerView recyclerView = getListView();
if (recyclerView != null) {
recyclerView.setPadding(padding, 0, padding, 0);
}
}
/** Updates the preference internal paddings */
public void updatePreferencePadding(boolean isTwoPane) {
iteratePreferences(new PreferenceJob() {
private int mIconPaddingStart;
private int mTextPaddingStart;
@Override
public void init() {
mIconPaddingStart = getResources().getDimensionPixelSize(isTwoPane
? R.dimen.homepage_preference_icon_padding_start_two_pane
: R.dimen.homepage_preference_icon_padding_start);
mTextPaddingStart = getResources().getDimensionPixelSize(isTwoPane
? R.dimen.homepage_preference_text_padding_start_two_pane
: R.dimen.homepage_preference_text_padding_start);
}
@Override
public void doForEach(Preference preference) {
if (preference instanceof HomepagePreferenceLayout) {
((HomepagePreferenceLayout) preference).getHelper()
.setIconPaddingStart(mIconPaddingStart);
((HomepagePreferenceLayout) preference).getHelper()
.setTextPaddingStart(mTextPaddingStart);
}
}
});
}
/** Returns a {@link TopLevelHighlightMixin} that performs highlighting */
public TopLevelHighlightMixin getHighlightMixin() {
return mHighlightMixin;
@@ -261,6 +310,31 @@ public class TopLevelSettings extends DashboardFragment implements
}
}
private void iteratePreferences(PreferenceJob job) {
if (job == null || getPreferenceManager() == null) {
return;
}
PreferenceScreen screen = getPreferenceScreen();
if (screen == null) {
return;
}
job.init();
int count = screen.getPreferenceCount();
for (int i = 0; i < count; i++) {
Preference preference = screen.getPreference(i);
if (preference == null) {
break;
}
job.doForEach(preference);
}
}
private interface PreferenceJob {
default void init() {}
void doForEach(Preference preference);
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.top_level_settings) {