Merging from ub-launcher3-qt-future-dev @ build 6073465 am: af431d130c (77d3127f) · Commits · e / os / android_packages_apps_Trebuchet

res/values-mr/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		<string name="hotseat_out_of_space" msgid="7448809638125333693">"आवडीच्या ट्रे मध्ये आणखी जागा नाही"</string>
		<string name="all_apps_button_label" msgid="8130441508702294465">"अ‍ॅप्स सूची"</string>
		<string name="all_apps_button_personal_label" msgid="1315764287305224468">"वैयक्तिक अ‍ॅप्स सूची"</string>
		<string name="all_apps_button_work_label" msgid="7270707118948892488">"कामाच्या ठिकाणी वापरली जाणाऱ्या अॅप्सची सूची"</string>
		<string name="all_apps_button_work_label" msgid="7270707118948892488">"कामाच्या ठिकाणी वापरली जाणाऱ्या ॲप्सची सूची"</string>
		<string name="all_apps_home_button_label" msgid="252062713717058851">"होम"</string>
		<string name="remove_drop_target_label" msgid="7812859488053230776">"काढा"</string>
		<string name="uninstall_drop_target_label" msgid="4722034217958379417">"अनइंस्टॉल करा"</string>
		@@ -92,7 +92,7 @@
		<string name="title_change_settings" msgid="1376365968844349552">"सेटिंग्ज बदला"</string>
		<string name="notification_dots_service_title" msgid="4284221181793592871">"सूचना बिंदू दाखवा"</string>
		<string name="auto_add_shortcuts_label" msgid="8222286205987725611">"होम स्क्रीनवर आयकन जोडा"</string>
		<string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन अॅप्ससाठी"</string>
		<string name="auto_add_shortcuts_description" msgid="7117251166066978730">"नवीन ॲप्ससाठी"</string>
		<string name="package_state_unknown" msgid="7592128424511031410">"अज्ञात"</string>
		<string name="abandoned_clean_this" msgid="7610119707847920412">"काढा"</string>
		<string name="abandoned_search" msgid="891119232568284442">"शोधा"</string>

res/values-or/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@
		<string name="allow_rotation_title" msgid="7728578836261442095">"ହୋମ୍‌ ସ୍କ୍ରୀନ୍ ବୁଲାଇବା ଅନୁମତି ଦିଅନ୍ତୁ"</string>
		<string name="allow_rotation_desc" msgid="8662546029078692509">"ଯେତେବେଳେ ଫୋନକୁ ବୁଲାଯାଇଥାଏ"</string>
		<string name="notification_dots_title" msgid="9062440428204120317">"ବିଜ୍ଞପ୍ତି ଡଟ୍ସ"</string>
		<string name="notification_dots_desc_on" msgid="1679848116452218908">"ଚାଲୁ କରନ୍ତୁ"</string>
		<string name="notification_dots_desc_on" msgid="1679848116452218908">"ଚାଲୁ"</string>
		<string name="notification_dots_desc_off" msgid="1760796511504341095">"ବନ୍ଦ କରନ୍ତୁ"</string>
		<string name="title_missing_notification_access" msgid="7503287056163941064">"ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍‌ ଆବଶ୍ୟକ ଅଟେ"</string>
		<string name="msg_missing_notification_access" msgid="281113995110910548">"ବିଜ୍ଞପ୍ତି ବିନ୍ଦୁ ଦେଖାଇବାକୁ, <xliff:g id="NAME">%1$s</xliff:g> ପାଇଁ ଆପ୍‌ ବିଜ୍ଞପ୍ତି ଅନ୍‌ କରନ୍ତୁ"</string>

res/values-pl/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@
		<string name="widget_resized" msgid="9130327887929620">"Szerokość i wysokość widżetu zmieniła się na <xliff:g id="NUMBER_0">%1$s</xliff:g> x <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string>
		<string name="action_deep_shortcut" msgid="2864038805849372848">"Skróty"</string>
		<string name="shortcuts_menu_with_notifications_description" msgid="2676582286544232849">"Skróty i powiadomienia"</string>
		<string name="action_dismiss_notification" msgid="5909461085055959187">"Odrzuć"</string>
		<string name="action_dismiss_notification" msgid="5909461085055959187">"Zamknij"</string>
		<string name="notification_dismissed" msgid="6002233469409822874">"Powiadomienie odrzucone"</string>
		<string name="all_apps_personal_tab" msgid="4190252696685155002">"Osobiste"</string>
		<string name="all_apps_work_tab" msgid="4884822796154055118">"Praca"</string>

src/com/android/launcher3/model/ModelWriter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public class ModelWriter {
		*/
		public void addOrMoveItemInDatabase(ItemInfo item,
		int container, int screenId, int cellX, int cellY) {
		if (item.container == ItemInfo.NO_ID) {
		if (item.id == ItemInfo.NO_ID) {
		// From all apps
		addItemToDatabase(item, container, screenId, cellX, cellY);
		} else {

src/com/android/launcher3/settings/SettingsActivity.java

+22 −8

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.launcher3.settings;

		import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;

		import static com.android.launcher3.SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY;
		import static com.android.launcher3.states.RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY;
		import static com.android.launcher3.states.RotationHelper.getAllowRotationDefaultValue;
		@@ -32,14 +34,7 @@ import android.os.Bundle;
		import android.provider.Settings;
		import android.text.TextUtils;

		import com.android.launcher3.LauncherFiles;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.graphics.GridOptionsProvider;
		import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
		import com.android.launcher3.util.SecureSettingsObserver;

		import androidx.annotation.NonNull;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceFragment;
		import androidx.preference.PreferenceFragment.OnPreferenceStartFragmentCallback;
		@@ -48,6 +43,14 @@ import androidx.preference.PreferenceGroup.PreferencePositionCallback;
		import androidx.preference.PreferenceScreen;
		import androidx.recyclerview.widget.RecyclerView;

		import com.android.launcher3.LauncherFiles;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.graphics.GridOptionsProvider;
		import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
		import com.android.launcher3.util.SecureSettingsObserver;

		/**
		* Settings activity for Launcher. Currently implements the following setting: Allow rotation
		*/
		@@ -248,6 +251,8 @@ public class SettingsActivity extends Activity
		if (highlighter != null) {
		getView().postDelayed(highlighter, DELAY_HIGHLIGHT_DURATION_MILLIS);
		mPreferenceHighlighted = true;
		} else {
		requestAccessibilityFocus(getListView());
		}
		}
		}
		@@ -268,6 +273,15 @@ public class SettingsActivity extends Activity
		return position >= 0 ? new PreferenceHighlighter(list, position) : null;
		}

		private void requestAccessibilityFocus(@NonNull final RecyclerView rv) {
		rv.post(() -> {
		if (!rv.hasFocus() && rv.getChildCount() > 0) {
		rv.getChildAt(0)
		.performAccessibilityAction(ACTION_ACCESSIBILITY_FOCUS, null);
		}
		});
		}

		@Override
		public void onDestroy() {
		if (mNotificationDotsObserver != null) {