Merge "Remove GSF on old QS" into main (f3c8b1b9) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/styles.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -819,11 +819,6 @@
		<item name="android:textColor">?attr/onSurfaceVariant</item>
		</style>

		<style name="TextAppearance.QSEditTitle" >
		<item name="android:fontFamily">"gsf-title-medium-emphasized"</item>
		<item name="android:textColor">?attr/onSurfaceVariant</item>
		</style>

		<style name="QSCustomizeToolbar" parent="@*android:style/Widget.DeviceDefault.Toolbar">
		<item name="android:textColor">?attr/onSurface</item>
		<item name="android:elevation">10dp</item>

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;

		import static com.android.settingslib.flags.Flags.newStatusBarIcons;
		import static com.android.systemui.DejankUtils.whitelistIpcs;
		import static com.android.systemui.Flags.gsfQuickSettings;

		import static java.lang.annotation.RetentionPolicy.SOURCE;

		@@ -34,7 +33,6 @@ import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.Rect;
		import android.graphics.Typeface;
		import android.graphics.drawable.Drawable;
		import android.os.UserHandle;
		import android.provider.Settings;
		@@ -52,7 +50,6 @@ import androidx.annotation.VisibleForTesting;

		import com.android.app.animation.Interpolators;
		import com.android.systemui.DualToneHandler;
		import com.android.systemui.FontStyles;
		import com.android.systemui.battery.unified.BatteryColors;
		import com.android.systemui.battery.unified.BatteryDrawableState;
		import com.android.systemui.battery.unified.BatteryLayersDrawable;
		@@ -387,10 +384,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
		}
		float fontHeight = mBatteryPercentView.getPaint().getFontMetricsInt(null);
		mBatteryPercentView.setLineHeight(TypedValue.COMPLEX_UNIT_PX, fontHeight);
		if (gsfQuickSettings()) {
		mBatteryPercentView.setTypeface(
		Typeface.create(FontStyles.GSF_LABEL_LARGE, Typeface.NORMAL));
		}
		if (mTextColor != 0) mBatteryPercentView.setTextColor(mTextColor);
		addView(mBatteryPercentView, new LayoutParams(
		LayoutParams.WRAP_CONTENT,

packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -16,17 +16,13 @@

		package com.android.systemui.qs;

		import static com.android.systemui.Flags.gsfQuickSettings;

		import android.content.ClipData;
		import android.content.ClipboardManager;
		import android.graphics.Typeface;
		import android.text.TextUtils;
		import android.view.View;
		import android.widget.TextView;
		import android.widget.Toast;

		import com.android.systemui.FontStyles;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.qs.dagger.QSScope;
		@@ -68,9 +64,6 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme
		mRetailModeInteractor = retailModeInteractor;

		mBuildText = mView.findViewById(R.id.build);
		if (gsfQuickSettings()) {
		mBuildText.setTypeface(Typeface.create(FontStyles.GSF_BODY_MEDIUM, Typeface.NORMAL));
		}
		mPageIndicator = mView.findViewById(R.id.footer_page_indicator);
		mEditButton = mView.findViewById(android.R.id.edit);
		}

packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		*/
		package com.android.systemui.qs.customize;

		import static com.android.systemui.Flags.gsfQuickSettings;

		import android.animation.Animator;
		import android.animation.Animator.AnimatorListener;
		import android.animation.AnimatorListenerAdapter;
		@@ -83,9 +81,6 @@ public class QSCustomizer extends LinearLayout {
		mToolbar.getMenu().add(Menu.NONE, MENU_RESET, 0, com.android.internal.R.string.reset)
		.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
		mToolbar.setTitle(R.string.qs_edit);
		if (gsfQuickSettings()) {
		mToolbar.setTitleTextAppearance(context, R.style.TextAppearance_QSEditTitle);
		}

		mRecyclerView = findViewById(android.R.id.list);
		mTransparentView = findViewById(R.id.customizer_transparent_view);

packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -14,15 +14,12 @@

		package com.android.systemui.qs.customize;

		import static com.android.systemui.Flags.gsfQuickSettings;

		import android.content.ComponentName;
		import android.content.Context;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.Canvas;
		import android.graphics.Rect;
		import android.graphics.Typeface;
		import android.graphics.drawable.Drawable;
		import android.os.Handler;
		import android.view.LayoutInflater;
		@@ -47,7 +44,6 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;

		import com.android.internal.logging.UiEventLogger;
		import com.android.systemui.FontSizeUtils;
		import com.android.systemui.FontStyles;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.qs.QSEditEvent;
		@@ -313,10 +309,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		if (viewType == TYPE_HEADER) {
		View v = inflater.inflate(R.layout.qs_customize_header, parent, false);
		v.setMinimumHeight(calculateHeaderMinHeight(context));
		if (gsfQuickSettings()) {
		((TextView) v.findViewById(android.R.id.title)).setTypeface(
		Typeface.create(FontStyles.GSF_LABEL_LARGE, Typeface.NORMAL));
		}
		return new Holder(v);
		}
		if (viewType == TYPE_DIVIDER) {