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

Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 1932476fae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: I3e0bb2e2878d4fcd13bed21a4c4b402140547395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
PETER LIANG
2022-05-13 17:47:14 +00:00
committed by Automerger Merge Worker
parent 458e433495 1932476fae
commit 4e389f18fe
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java
View File

@@ -27,8 +27,11 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.widget.LayoutPreference;
import com.google.android.setupdesign.GlifPreferenceLayout; import com.google.android.setupdesign.GlifPreferenceLayout;
import com.google.android.setupdesign.util.LayoutStyler;
/** /**
* A {@link androidx.preference.PreferenceFragmentCompat} that displays the settings page related * A {@link androidx.preference.PreferenceFragmentCompat} that displays the settings page related
@@ -47,6 +50,8 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref
icon.setTintList(Utils.getColorAttr(getContext(), android.R.attr.colorPrimary)); icon.setTintList(Utils.getColorAttr(getContext(), android.R.attr.colorPrimary));
AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title, AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,
/* description= */ null, icon); /* description= */ null, icon);
updateResetButtonPadding();
} }
@Override @Override
@@ -66,4 +71,14 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref
// Hides help center in action bar and footer bar in SuW // Hides help center in action bar and footer bar in SuW
return 0; 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);
}
} }

6
tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.settings.accessibility.TextReadingPreferenceFragment.RESET_KEY;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -25,6 +27,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.widget.LayoutPreference;
import com.google.android.setupdesign.GlifPreferenceLayout; import com.google.android.setupdesign.GlifPreferenceLayout;
@@ -51,6 +54,9 @@ public class TextReadingPreferenceFragmentForSetupWizardTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mFragment = spy(new TextReadingPreferenceFragmentForSetupWizard()); mFragment = spy(new TextReadingPreferenceFragmentForSetupWizard());
final LayoutPreference resetPreference =
new LayoutPreference(mContext, R.layout.accessibility_text_reading_reset_button);
doReturn(resetPreference).when(mFragment).findPreference(RESET_KEY);
} }
@Test @Test