Snap for 5771674 from 22eceae195d2f9c00d7a0f3b17d3916144ea4b35 to qt-c2f2-release (d82776b8) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebSettings.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -464,7 +464,9 @@ public abstract class WebSettings {
		* Note that the feature will continue to be supported on older versions of
		* Android as before.
		*
		* This function does not have any effect.
		* @deprecated In Android O and afterwards, this function does not have
		* any effect, the form data will be saved to platform's autofill service
		* if applicable.
		*/
		@Deprecated
		public abstract void setSaveFormData(boolean save);

core/java/com/android/internal/widget/MediaNotificationView.java

+0 −47

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ import android.widget.FrameLayout;
		import android.widget.ImageView;
		import android.widget.RemoteViews;

		import java.util.ArrayList;

		/**
		* A TextView that can float around an image on the end.
		*
		@@ -44,7 +42,6 @@ public class MediaNotificationView extends FrameLayout {
		private View mMainColumn;
		private View mMediaContent;
		private int mImagePushIn;
		private ArrayList<VisibilityChangeListener> mListeners;

		public MediaNotificationView(Context context) {
		this(context, null);
		@@ -171,48 +168,4 @@ public class MediaNotificationView extends FrameLayout {
		mMainColumn = findViewById(com.android.internal.R.id.notification_main_column);
		mMediaContent = findViewById(com.android.internal.R.id.notification_media_content);
		}

		@Override
		public void onVisibilityAggregated(boolean isVisible) {
		super.onVisibilityAggregated(isVisible);
		for (int i = 0; i < mListeners.size(); i++) {
		mListeners.get(i).onAggregatedVisibilityChanged(isVisible);
		}
		}

		/**
		* Add a listener to receive updates on the visibility of this view
		*
		* @param listener The listener to add.
		*/
		public void addVisibilityListener(VisibilityChangeListener listener) {
		if (mListeners == null) {
		mListeners = new ArrayList<>();
		}
		if (!mListeners.contains(listener)) {
		mListeners.add(listener);
		}
		}

		/**
		* Remove the specified listener
		*
		* @param listener The listener to remove.
		*/
		public void removeVisibilityListener(VisibilityChangeListener listener) {
		if (mListeners != null) {
		mListeners.remove(listener);
		}
		}

		/**
		* Interface for receiving updates when the view's visibility changes
		*/
		public interface VisibilityChangeListener {
		/**
		* Method called when the visibility of this view has changed
		* @param isVisible true if the view is now visible
		*/
		void onAggregatedVisibilityChanged(boolean isVisible);
		}
		}

core/res/res/values-af/strings.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -95,8 +95,7 @@
		<string name="notification_channel_voice_mail" msgid="3954099424160511919">"Stemboodskappe"</string>
		<string name="notification_channel_wfc" msgid="2130802501654254801">"Wi-Fi-oproepe"</string>
		<string name="notification_channel_sim" msgid="4052095493875188564">"SIM-status"</string>
		<!-- no translation found for notification_channel_sim_high_prio (1787666807724243207) -->
		<skip />
		<string name="notification_channel_sim_high_prio" msgid="1787666807724243207">"Hoëprioriteit-SIM-status"</string>
		<string name="peerTtyModeFull" msgid="6165351790010341421">"Ander party het TTY-modus VOL versoek"</string>
		<string name="peerTtyModeHco" msgid="5728602160669216784">"Ander party het TTY-modus GOD versoek"</string>
		<string name="peerTtyModeVco" msgid="1742404978686538049">"Ander party het TTY-modus SOD versoek"</string>

core/res/res/values-am/strings.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -95,8 +95,7 @@
		<string name="notification_channel_voice_mail" msgid="3954099424160511919">"የድምጽ መልዕክቶች"</string>
		<string name="notification_channel_wfc" msgid="2130802501654254801">"የWi-Fi ጥሪ"</string>
		<string name="notification_channel_sim" msgid="4052095493875188564">"የሲም ሁኔታ"</string>
		<!-- no translation found for notification_channel_sim_high_prio (1787666807724243207) -->
		<skip />
		<string name="notification_channel_sim_high_prio" msgid="1787666807724243207">"ከፍተኛ ቅድሚያ ተሰጪ የሲም ኹናቴ"</string>
		<string name="peerTtyModeFull" msgid="6165351790010341421">"ቢጤ መልዕክት መጻጻፊያ ስልክ ሁነታ FULL ጠይቋል"</string>
		<string name="peerTtyModeHco" msgid="5728602160669216784">"ቢጤ መልዕክት መጻጻፊያ ስልክ ሁነታ HCO ጠይቋል"</string>
		<string name="peerTtyModeVco" msgid="1742404978686538049">"ቢጤ መልዕክት መጻጻፊያ ስልክ ሁነታ VCO ጠይቋል"</string>

core/res/res/values-ar/strings.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,7 @@
		<string name="notification_channel_voice_mail" msgid="3954099424160511919">"رسائل البريد الصوتي"</string>
		<string name="notification_channel_wfc" msgid="2130802501654254801">"‏الاتصال عبر Wi-Fi"</string>
		<string name="notification_channel_sim" msgid="4052095493875188564">"‏حالة شريحة SIM"</string>
		<!-- no translation found for notification_channel_sim_high_prio (1787666807724243207) -->
		<skip />
		<string name="notification_channel_sim_high_prio" msgid="1787666807724243207">"‏حالة شريحة SIM ذات أولوية"</string>
		<string name="peerTtyModeFull" msgid="6165351790010341421">"‏طلب النظير وضع TTY الكامل"</string>
		<string name="peerTtyModeHco" msgid="5728602160669216784">"‏طلب النظير وضع TTY على HCO"</string>
		<string name="peerTtyModeVco" msgid="1742404978686538049">"‏طلب النظير وضع TTY على VCO"</string>