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

Merge "Fix glifLayout is not align the preference in SuW" into sc-dev am: ceed5d817b

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

Change-Id: I02d96149f673917b001ae3c2a5be959b9ab783d6
This commit is contained in:
Menghan Li
2021-05-20 06:27:19 +00:00
committed by Automerger Merge Worker
parent 7f7cf45879 ceed5d817b
commit 63c739ef60
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
View File

@@ -28,13 +28,11 @@ import android.content.pm.ServiceInfo;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import android.widget.FrameLayout; import android.widget.LinearLayout;
import android.widget.ImageView;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@@ -44,6 +42,7 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.RestrictedPreference; import com.android.settingslib.RestrictedPreference;
import com.google.android.setupdesign.GlifPreferenceLayout; import com.google.android.setupdesign.GlifPreferenceLayout;
import com.google.android.setupdesign.util.ThemeHelper;
import java.util.List; import java.util.List;
@@ -85,14 +84,13 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
layout.setDividerInsets(Integer.MAX_VALUE, 0); layout.setDividerInsets(Integer.MAX_VALUE, 0);
layout.setDescriptionText(R.string.vision_settings_description); layout.setDescriptionText(R.string.vision_settings_description);
layout.setHeaderText(R.string.vision_settings_title); layout.setHeaderText(R.string.vision_settings_title);
layout.setIcon(getResources().getDrawable(R.drawable.ic_accessibility_visibility)); layout.setIcon(getPrefContext().getDrawable(R.drawable.ic_accessibility_visibility));
final ImageView iconView = layout.findManagedViewById(R.id.sud_layout_icon); if (ThemeHelper.shouldApplyExtendedPartnerConfig(getActivity())) {
final FrameLayout.LayoutParams params = final LinearLayout headerLayout = layout.findManagedViewById(R.id.sud_layout_header);
(FrameLayout.LayoutParams) iconView.getLayoutParams(); headerLayout.setPadding(0, headerLayout.getPaddingTop(), 0,
params.gravity = Gravity.START; headerLayout.getPaddingBottom());
layout.getHeaderTextView().setGravity(Gravity.START); }
layout.getDescriptionTextView().setGravity(Gravity.START);
} }
@Override @Override