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

Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev am: 17df1ff01f

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

Change-Id: I7b9a5992c671ed304e3ad2cdec7f546d6c77b446
This commit is contained in:
TreeHugger Robot
2021-11-01 02:50:16 +00:00
committed by Automerger Merge Worker
parent 6230bf1f1c 17df1ff01f
commit 4ef8d14ed7
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivity.java
View File

@@ -21,6 +21,7 @@ import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -69,7 +70,7 @@ public class AccessibilityScreenSizeForSetupWizardActivity extends InstrumentedA
? R.style.SudDynamicColorThemeGlifV3_DayNight : R.style.SudThemeGlifV3_DayNight;
setTheme(appliedTheme);
setContentView(R.layout.accessibility_screen_size_setup_wizard);
generateHeader();
updateHeaderLayout();
scrollToBottom();
initFooterButton();
if (savedInstanceState == null) {
@@ -101,7 +102,15 @@ public class AccessibilityScreenSizeForSetupWizardActivity extends InstrumentedA
}
@VisibleForTesting
void generateHeader() {
void updateHeaderLayout() {
if (ThemeHelper.shouldApplyExtendedPartnerConfig(this) && isSuwSupportedTwoPanes()) {
final GlifLayout layout = findViewById(R.id.setup_wizard_layout);
final LinearLayout headerLayout = layout.findManagedViewById(R.id.sud_layout_header);
if (headerLayout != null) {
headerLayout.setPadding(0, layout.getPaddingTop(), 0,
layout.getPaddingBottom());
}
}
((TextView) findViewById(R.id.suc_layout_title)).setText(
getFragmentType(getIntent()) == FragmentType.FONT_SIZE
? R.string.title_font_size
@@ -112,6 +121,10 @@ public class AccessibilityScreenSizeForSetupWizardActivity extends InstrumentedA
: R.string.screen_zoom_short_summary);
}
private boolean isSuwSupportedTwoPanes() {
return getResources().getBoolean(R.bool.config_suw_supported_two_panes);
}
private void initFooterButton() {
final GlifLayout layout = findViewById(R.id.setup_wizard_layout);
final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);