Merge "Add the no calling & SMS icons for Provider Model" (60a6e3ae) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		<item><xliff:g id="id">@string/status_bar_hotspot</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_airplane</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_no_calling</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_battery</xliff:g></item>
		<item><xliff:g id="id">@string/status_bar_sensors_off</xliff:g></item>
		</string-array>
		@@ -94,6 +95,7 @@
		<string translatable="false" name="status_bar_microphone">microphone</string>
		<string translatable="false" name="status_bar_camera">camera</string>
		<string translatable="false" name="status_bar_airplane">airplane</string>
		<string translatable="false" name="status_bar_no_calling">no_calling</string>
		<string translatable="false" name="status_bar_sensors_off">sensors_off</string>
		<string translatable="false" name="status_bar_screen_record">screen_record</string>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2947,6 +2947,7 @@
		<java-symbol type="string" name="status_bar_secure" />
		<java-symbol type="string" name="status_bar_clock" />
		<java-symbol type="string" name="status_bar_airplane" />
		<java-symbol type="string" name="status_bar_no_calling" />
		<java-symbol type="string" name="status_bar_mobile" />
		<java-symbol type="string" name="status_bar_ethernet" />
		<java-symbol type="string" name="status_bar_vpn" />

packages/SystemUI/res/drawable/ic_qs_no_calling_sms.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2020 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FF000000"
		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10c0.34,0 0.68,-0.02 1.01,-0.05V20h-1v-0.04c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96H13v-2H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2H21.8C20.87,5.44 16.83,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56C16.43,5.07 17.96,6.35 18.92,8zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82C10.52,6.57 11.17,5.24 12,4.04zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2H4.26zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56C7.57,18.93 6.04,17.66 5.08,16zM8.03,8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8z"
		android:fillAlpha="0.3"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22,19.3v-0.9l-3.37,-2.25v-2.47C18.63,13.3 18.35,13 18,13s-0.63,0.3 -0.63,0.68v2.47L14,18.4v0.9l3.37,-1.12v2.48l-0.84,0.68V22L18,21.55L19.47,22v-0.67l-0.84,-0.68v-2.48L22,19.3z"/>
		</vector>
		No newline at end of file

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import com.android.systemui.statusbar.StatusBarMobileView;
		import com.android.systemui.statusbar.StatusBarWifiView;
		import com.android.systemui.statusbar.StatusIconDisplayable;
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState;
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.NoCallingIconState;
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState;

		import java.util.List;
		@@ -62,6 +63,10 @@ public interface StatusBarIconController {
		public void setIcon(String slot, StatusBarIcon icon);
		public void setSignalIcon(String slot, WifiIconState state);
		public void setMobileIcons(String slot, List<MobileIconState> states);
		/**
		* Display the no calling & SMS icons.
		*/
		void setNoCallingIcons(String slot, List<NoCallingIconState> states);
		public void setIconVisibility(String slot, boolean b);

		/**

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.systemui.demomode.DemoModeController;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.StatusIconDisplayable;
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState;
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.NoCallingIconState;
		import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
		@@ -216,6 +217,29 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu
		}
		}

		/**
		* Accept a list of NoCallingIconStates, and show them in the same slot
		* @param slot StatusBar slot
		* @param states All of the no Calling & SMS icon states
		*/
		@Override
		public void setNoCallingIcons(String slot, List<NoCallingIconState> states) {
		Slot noCallingSlot = getSlot(slot);
		int slotIndex = getSlotIndex(slot);

		for (NoCallingIconState state : states) {
		StatusBarIconHolder holder = noCallingSlot.getHolderForTag(state.subId);
		if (holder == null) {
		holder = StatusBarIconHolder.fromNoCallingState(mContext, state);
		holder.setVisible(state.visible);
		setIcon(slotIndex, holder);
		} else {
		holder.setVisible(state.visible);
		setIcon(slotIndex, holder);
		}
		}
		}

		@Override
		public void setExternalIcon(String slot) {
		int viewIndex = getViewIndex(getSlotIndex(slot), 0);