Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (efddf78d) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -284,6 +284,7 @@
		android:theme="@style/TunerSettings"
		android:label="@string/system_ui_tuner"
		android:process=":tuner"
		android:configChanges="orientation\|screenSize"
		android:exported="true">
		<intent-filter>
		<action android:name="com.android.settings.action.EXTRA_SETTINGS" />

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java

+20 −27

Original line number	Diff line number	Diff line
		@@ -45,8 +45,6 @@ import com.android.systemui.tuner.TunerService;
		import com.android.systemui.tuner.TunerService.Tunable;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;
		import java.util.Objects;

		@@ -182,9 +180,14 @@ public class NavigationBarInflaterView extends FrameLayout
		inflateLayout(mCurrentLayout);
		} else if (NAV_BAR_INVERSE.equals(key)) {
		mInverseLayout = TunerService.parseIntegerSwitch(newValue, false);
		clearViews();
		inflateLayout(mCurrentLayout);
		updateLayoutInversion();
		}
		}

		@Override
		public void onConfigurationChanged(Configuration newConfig) {
		super.onConfigurationChanged(newConfig);
		updateLayoutInversion();
		}

		public void onLikelyDefaultLayoutChange() {
		@@ -260,17 +263,6 @@ public class NavigationBarInflaterView extends FrameLayout
		}
		}

		private String[] swapLeftAndRight(String[] set) {
		for (int i = 0; i < set.length; i++) {
		if (set.equals(LEFT)) {
		set[i] = RIGHT;
		} else if (set[i].equals(RIGHT)) {
		set[i] = LEFT;
		}
		}
		return set;
		}

		protected void inflateLayout(String newLayout) {
		mCurrentLayout = newLayout;
		if (newLayout == null) {
		@@ -285,18 +277,6 @@ public class NavigationBarInflaterView extends FrameLayout
		String[] start = sets[0].split(BUTTON_SEPARATOR);
		String[] center = sets[1].split(BUTTON_SEPARATOR);
		String[] end = sets[2].split(BUTTON_SEPARATOR);
		// Invert start, center and end if needed.
		if (mInverseLayout) {
		List<String> newStart = Arrays.asList(end);
		List<String> newCenter = Arrays.asList(center);
		List<String> newEnd = Arrays.asList(start);
		Collections.reverse(newStart);
		Collections.reverse(newCenter);
		Collections.reverse(newEnd);
		start = swapLeftAndRight((String[]) newStart.toArray());
		center = swapLeftAndRight((String[]) newCenter.toArray());
		end = swapLeftAndRight((String[]) newEnd.toArray());
		}
		// Inflate these in start to end order or accessibility traversal will be messed up.
		inflateButtons(start, mRot0.findViewById(R.id.ends_group), isRot0Landscape, true);
		inflateButtons(start, mRot90.findViewById(R.id.ends_group), !isRot0Landscape, true);
		@@ -313,6 +293,19 @@ public class NavigationBarInflaterView extends FrameLayout
		updateButtonDispatchersCurrentView();
		}

		private void updateLayoutInversion() {
		if (mInverseLayout) {
		Configuration config = mContext.getResources().getConfiguration();
		if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
		setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
		} else {
		setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
		}
		} else {
		setLayoutDirection(View.LAYOUT_DIRECTION_INHERIT);
		}
		}

		private void addGravitySpacer(LinearLayout layout) {
		layout.addView(new Space(mContext), new LinearLayout.LayoutParams(0, 0, 1));
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1981,7 +1981,7 @@ public class NotificationPanelView extends PanelView implements
		\|\| mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED)) {
		KeyguardAffordanceView lockIcon = mKeyguardBottomArea.getLockIcon();
		lockIcon.setImageAlpha(0.0f, true, 100, Interpolators.FAST_OUT_LINEAR_IN, null);
		lockIcon.setImageScale(2.0f, true, 100, Interpolators.FAST_OUT_LINEAR_IN);
		lockIcon.setImageScale(1.0f, true, 100, Interpolators.FAST_OUT_LINEAR_IN);
		}
		}