Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (f8d64094) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/MediaRouteDialogPresenter.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,8 @@ public abstract class MediaRouteDialogPresenter {
		final MediaRouter router = context.getSystemService(MediaRouter.class);

		MediaRouter.RouteInfo route = router.getSelectedRoute();
		if (route.isDefault() \|\| !route.matchesTypes(routeTypes)) {
		if (route.isDefault() \|\| !route.matchesTypes(routeTypes)
		\|\| route.getStatusCode() == MediaRouter.RouteInfo.STATUS_NOT_AVAILABLE) {
		final MediaRouteChooserDialog d = new MediaRouteChooserDialog(context, theme,
		showProgressBarWhenEmpty);
		d.setRouteTypes(routeTypes);

packages/SystemUI/res/layout/screenshot_static.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@
		android:id="@+id/screenshot_share_chip"/>
		<include layout="@layout/overlay_action_chip"
		android:id="@+id/screenshot_edit_chip"/>
		<include layout="@layout/overlay_action_chip"
		android:id="@+id/screenshot_delete_chip"/>
		<include layout="@layout/overlay_action_chip"
		android:id="@+id/screenshot_scroll_chip"
		android:visibility="gone" />

packages/SystemUI/res/values/cm_strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -115,4 +115,9 @@
		<!-- Name of the firewall status bar icon. -->
		<string name="status_bar_firewall">Firewall</string>
		<string name="status_bar_firewall_slot" translatable="false">firewall</string>

		<!-- Label for UI element which allows deleting the screenshot [CHAR LIMIT=30] -->
		<string name="screenshot_delete_label">Delete</string>
		<!-- Content description indicating that tapping the element will allow deleting the screenshot [CHAR LIMIT=NONE] -->
		<string name="screenshot_delete_description">Delete screenshot</string>
		</resources>

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+12 −15

Original line number	Diff line number	Diff line
		@@ -78,8 +78,8 @@ public class CastTile extends QSTileImpl<BooleanState> {
		private final NetworkController mNetworkController;
		private final DialogLaunchAnimator mDialogLaunchAnimator;
		private final Callback mCallback = new Callback();
		private boolean mWifiConnected;
		private boolean mHotspotConnected;
		private boolean mWifiEnabled;
		private boolean mHotspotEnabled;

		@Inject
		public CastTile(
		@@ -288,19 +288,17 @@ public class CastTile extends QSTileImpl<BooleanState> {
		}

		private boolean canCastToWifi() {
		return mWifiConnected \|\| mHotspotConnected;
		return mWifiEnabled \|\| mHotspotEnabled;
		}

		private final SignalCallback mSignalCallback = new SignalCallback() {
		@Override
		public void setWifiIndicators(@NonNull WifiIndicators indicators) {
		// statusIcon.visible has the connected status information
		boolean enabledAndConnected = indicators.enabled
		&& (indicators.qsIcon == null ? false : indicators.qsIcon.visible);
		if (enabledAndConnected != mWifiConnected) {
		mWifiConnected = enabledAndConnected;
		// Hotspot is not connected, so changes here should update
		if (!mHotspotConnected) {
		boolean enabled = indicators.enabled;
		if (enabled != mWifiEnabled) {
		mWifiEnabled = enabled;
		// Hotspot is not enabled, so changes here should update
		if (!mHotspotEnabled) {
		refreshState();
		}
		}
		@@ -311,11 +309,10 @@ public class CastTile extends QSTileImpl<BooleanState> {
		new HotspotController.Callback() {
		@Override
		public void onHotspotChanged(boolean enabled, int numDevices) {
		boolean enabledAndConnected = enabled && numDevices > 0;
		if (enabledAndConnected != mHotspotConnected) {
		mHotspotConnected = enabledAndConnected;
		// Wifi is not connected, so changes here should update
		if (!mWifiConnected) {
		if (enabled != mHotspotEnabled) {
		mHotspotEnabled = enabled;
		// Wifi is not enabled, so changes here should update
		if (!mWifiEnabled) {
		refreshState();
		}
		}

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotEvent.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum {
		SCREENSHOT_EDIT_TAPPED(308),
		@UiEvent(doc = "screenshot share button tapped")
		SCREENSHOT_SHARE_TAPPED(309),
		@UiEvent(doc = "screenshot delete button tapped")
		SCREENSHOT_DELETE_TAPPED(369),
		@UiEvent(doc = "screenshot smart action chip tapped")
		SCREENSHOT_SMART_ACTION_TAPPED(374),
		@UiEvent(doc = "screenshot scroll tapped")