Revert "SystemUI: Add support for displaying Volte icon" (3bffa57d) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+0 −9

Original line number	Diff line number	Diff line
		@@ -125,10 +125,6 @@ android_library {
		manifest: "AndroidManifest.xml",
		additional_manifests: ["LineageManifest.xml"],

		libs: [
		"ims-common",
		],

		kotlincflags: ["-Xjvm-default=enable"],

		plugins: ["dagger2-compiler"],
		@@ -221,7 +217,6 @@ android_library {
		libs: [
		"android.test.runner",
		"android.test.base",
		"ims-common",
		],
		kotlincflags: ["-Xjvm-default=enable"],
		aaptflags: [
		@@ -248,10 +243,6 @@ android_app {
		proguard_flags_files: ["proguard.flags"],
		},

		libs: [
		"ims-common",
		],

		kotlincflags: ["-Xjvm-default=enable"],

		dxflags: ["--multi-dex"],

packages/SystemUI/res/drawable/ic_volte.xml

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (c) 2017, The Linux Foundation. All rights reserved.
		Redistribution and use in source and binary forms, with or without
		modification, are permitted provided that the following conditions are
		met:
		* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
		* Redistributions in binary form must reproduce the above
		copyright notice, this list of conditions and the following
		disclaimer in the documentation and/or other materials provided
		with the distribution.
		* Neither the name of The Linux Foundation nor the names of its
		contributors may be used to endorse or promote products derived
		from this software without specific prior written permission.
		THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
		WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
		ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
		BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
		BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
		OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:height="24dp"
		android:width="30.5dp"
		android:viewportWidth="30.57"
		android:viewportHeight="24.0">

		<path
		android:fillColor="#ffffffff"
		android:pathData="M10.62,13.14 A0.42,0.42,0,0,0,10.23,13.36 A1.29,1.29,0,0,0,10.23,14.47 A0.45,0.45,0,0,0,11.01,14.47 A1.29,1.29,0,0,0,11.01,13.36 A0.42,0.42,0,0,0,10.62,13.14 Z" />
		<path
		android:fillColor="#ffffffff"
		android:pathData="M28.54,5.6 L2.06,5.6 A1.11,1.11,0,0,0,0.95,6.71 L0.95,18.24 A1.11,1.11,0,0,0,2.06,19.35 L28.54,19.35 A1.11,1.11,0,0,0,29.65,18.24 L29.65,6.71 A1.11,1.11,0,0,0,28.54,5.6 Z M5.31,15.6 L3.43,9.84 L4.94,9.84 L6.18,14.05 L7.42,9.84 L8.82,9.84 L6.94,15.59 L5.31,15.59 Z M12.19,14.85 A1.46,1.46,0,0,1,11.56,15.43 A2.11,2.11,0,0,1,10.61,15.63 A2.13,2.13,0,0,1,9.66,15.43 A1.45,1.45,0,0,1,9,14.83 A2,2,0,0,1,9,13 A1.45,1.45,0,0,1,9.63,12.42 A2.13,2.13,0,0,1,10.58,12.22 A2.11,2.11,0,0,1,11.53,12.42 A1.46,1.46,0,0,1,12.16,13 A2,2,0,0,1,12.2,14.83 Z M13.1,12.85 A0.4,0.4,0,0,1,12.57,12.65 A1.76,1.76,0,0,0,11.23,11.77 A0.4,0.4,0,0,1,10.87,11.33 A0.4,0.4,0,0,1,11.31,10.97 A2.57,2.57,0,0,1,13.31,12.32 A0.4,0.4,0,0,1,13.1,12.8 Z M14.29,11.93 A0.5,0.5,0,0,1,13.62,11.7 A2.66,2.66,0,0,0,11.51,10.37 A0.5,0.5,0,0,1,11.56,9.37 A3.66,3.66,0,0,1,14.56,11.26 A0.5,0.5,0,0,1,14.29,11.88 Z M18.56,15.6 L14.9,15.6 L14.9,9.81 L16.33,9.81 L16.33,14.39 L18.55,14.39 L18.55,15.55 Z M22.56,10.98 L21,10.98 L21,15.6 L19.58,15.6 L19.58,10.94 L18,10.94 L18,9.81 L22.54,9.81 L22.54,10.94 Z M27.16,15.6 L23.16,15.6 L23.16,9.81 L27.03,9.81 L27.03,10.92 L24.64,10.92 L24.64,12 L26.91,12 L26.91,13.13 L24.64,13.13 L24.64,14.4 L27.17,14.4 L27.17,15.55 Z" />
		</vector>
		No newline at end of file

packages/SystemUI/res/drawable/ic_volte_no_voice.xml

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--Copyright (c) 2018, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are
		* met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials provided
		* with the distribution.
		* * Neither the name of The Linux Foundation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
		* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
		* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
		* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
		* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="14dp"
		android:height="17dp"
		android:viewportWidth="14"
		android:viewportHeight="17">

		<path
		android:pathData="M 1.2 4 H 13.7 V 13.2 H 1.2 V 4 Z" />
		<path
		android:fillColor="#FFFFFF"
		android:pathData="M1.9,12.6V4h0.8v3.5h3.2V4h0.8v8.6H5.9v-4H2.7v4H1.9z" />
		<path
		android:fillColor="#FFFFFF"
		android:pathData="M8,12.6V4h2.1c0.5,0,0.8,0,1.1,0.1c0.4,0.1,0.7,0.3,0.9,0.6c0.3,0.4,0.6,0.9,0.7,1.5s0.2,1.3,0.2,2c0,0.7-0.1,1.2-0.2,1.7c-0.1,0.5-0.2,0.9-0.4,1.3S12.2,11.8,12,12s-0.4,0.3-0.7,0.4s-0.6,0.1-1,0.1H8zM8.8,11.6h1.3c0.4,0,0.7-0.1,0.9-0.2c0.2-0.1,0.4-0.3,0.5-0.4c0.2-0.3,0.3-0.6,0.4-1.1c0.1-0.5,0.2-1,0.2-1.7c0-0.9-0.1-1.6-0.3-2.1c-0.2-0.5-0.5-0.8-0.8-1C11,5.1,10.6,5,10.1,5H8.8V11.6z" />
		<path
		android:fillColor="#000000"
		android:pathData="M 2 9 L 1 9 L 1 9 L 2 9 Z" />
		<path
		android:fillColor="#FFFFFF"
		android:pathData="M 0.5 9 H 13.5 V 10 H 0.5 V 9 Z" />
		</vector>
		No newline at end of file

packages/SystemUI/res/layout/status_bar_mobile_signal_group.xml

+1 −8

Original line number	Diff line number	Diff line
		@@ -30,14 +30,7 @@
		android:layout_height="match_parent"
		android:gravity="center_vertical"
		android:orientation="horizontal" >
		<ImageView
		android:id="@+id/mobile_volte"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical"
		android:visibility="gone"
		android:paddingStart="3dp"
		android:paddingEnd="3dp"/>

		<FrameLayout
		android:id="@+id/inout_container"
		android:layout_height="17dp"

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -61,8 +61,6 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver,
		private boolean mForceHidden;
		private boolean mProviderModel;

		private ImageView mVolte;

		/**
		* Designated constructor
		*/
		@@ -123,7 +121,6 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver,
		mIn = findViewById(R.id.mobile_in);
		mOut = findViewById(R.id.mobile_out);
		mInoutContainer = findViewById(R.id.inout_container);
		mVolte = findViewById(R.id.mobile_volte);

		mMobileDrawable = new SignalDrawable(getContext());
		mMobile.setImageDrawable(mMobileDrawable);
		@@ -182,12 +179,6 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver,
		mOut.setVisibility(mState.activityOut ? View.VISIBLE : View.GONE);
		mInoutContainer.setVisibility((mState.activityIn \|\| mState.activityOut)
		? View.VISIBLE : View.GONE);
		if (mState.volteId > 0 ) {
		mVolte.setImageResource(mState.volteId);
		mVolte.setVisibility(View.VISIBLE);
		}else {
		mVolte.setVisibility(View.GONE);
		}
		}

		private boolean updateState(MobileIconState state) {
		@@ -221,15 +212,6 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver,
		mInoutContainer.setVisibility((state.activityIn \|\| state.activityOut)
		? View.VISIBLE : View.GONE);

		if (mState.volteId != state.volteId) {
		if (state.volteId != 0) {
		mVolte.setImageResource(state.volteId);
		mVolte.setVisibility(View.VISIBLE);
		} else {
		mVolte.setVisibility(View.GONE);
		}
		}

		needsLayout \|= state.roaming != mState.roaming
		\|\| state.activityIn != mState.activityIn
		\|\| state.activityOut != mState.activityOut
		@@ -249,7 +231,6 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver,
		mOut.setImageTintList(color);
		mMobileType.setImageTintList(color);
		mMobileRoaming.setImageTintList(color);
		mVolte.setImageTintList(color);
		mDotView.setDecorColor(tint);
		mDotView.setIconColor(tint, false);
		}
		@@ -271,7 +252,6 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver,
		mOut.setImageTintList(list);
		mMobileType.setImageTintList(list);
		mMobileRoaming.setImageTintList(list);
		mVolte.setImageTintList(list);
		mDotView.setDecorColor(color);
		}