Avoid the reset item having inconsistent alignment with the others under SuW.
Replaces the LayoutPreference with native Preference for the reset preference which is used for resettings the status of all preferences. Bug: 232528123 Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest,TextReadingResetPreferenceTest Change-Id: I00719f13dc78039269ee373c6b35e12e7ff595ce
This commit is contained in:
@@ -27,10 +27,8 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.Utils;
|
||||
import com.android.settingslib.widget.LayoutPreference;
|
||||
|
||||
import com.google.android.setupdesign.GlifPreferenceLayout;
|
||||
import com.google.android.setupdesign.util.LayoutStyler;
|
||||
|
||||
|
||||
/**
|
||||
@@ -50,8 +48,6 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref
|
||||
icon.setTintList(Utils.getColorAttr(getContext(), android.R.attr.colorPrimary));
|
||||
AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,
|
||||
/* description= */ null, icon);
|
||||
|
||||
updateResetButtonPadding();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -71,14 +67,4 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref
|
||||
// Hides help center in action bar and footer bar in SuW
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the padding of the reset button to meet for SetupWizard style.
|
||||
*/
|
||||
private void updateResetButtonPadding() {
|
||||
final LayoutPreference resetPreference = (LayoutPreference) findPreference(RESET_KEY);
|
||||
final ViewGroup parentView =
|
||||
(ViewGroup) resetPreference.findViewById(R.id.reset_button).getParent();
|
||||
LayoutStyler.applyPartnerCustomizationLayoutPaddingStyle(parentView);
|
||||
}
|
||||
}
|
||||
|
@@ -22,11 +22,9 @@ import android.view.View;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accessibility.TextReadingPreferenceFragment.EntryPoint;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.instrumentation.SettingsStatsLog;
|
||||
import com.android.settingslib.widget.LayoutPreference;
|
||||
|
||||
/**
|
||||
* The controller of the reset button in the text and reading options page.
|
||||
@@ -52,9 +50,9 @@ class TextReadingResetController extends BasePreferenceController {
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
|
||||
final LayoutPreference layoutPreference = screen.findPreference(getPreferenceKey());
|
||||
final View view = layoutPreference.findViewById(R.id.reset_button);
|
||||
view.setOnClickListener(v -> {
|
||||
final TextReadingResetPreference resetPreference =
|
||||
(TextReadingResetPreference) screen.findPreference(getPreferenceKey());
|
||||
resetPreference.setOnResetClickListener(v -> {
|
||||
if (mOnResetClickListener != null) {
|
||||
mOnResetClickListener.onClick(v);
|
||||
|
||||
|
@@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
/**
|
||||
* The preference which is used for resetting the status of all preferences in the display size
|
||||
* and text page.
|
||||
*/
|
||||
public class TextReadingResetPreference extends Preference {
|
||||
private View.OnClickListener mOnResetClickListener;
|
||||
|
||||
public TextReadingResetPreference(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
|
||||
setLayoutResource(R.layout.accessibility_text_reading_reset_button);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(PreferenceViewHolder holder) {
|
||||
super.onBindViewHolder(holder);
|
||||
|
||||
final View view = holder.findViewById(R.id.reset_button);
|
||||
view.setOnClickListener(mOnResetClickListener);
|
||||
}
|
||||
|
||||
void setOnResetClickListener(View.OnClickListener resetClickListener) {
|
||||
mOnResetClickListener = resetClickListener;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user