Merge remote-tracking branch 'origin/lineage-19.1' into v1-s (bb1b56de) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -2366,24 +2366,24 @@

		<!-- Exported for SystemUI to launch into -->
		<activity android:name=".deviceinfo.StorageWizardInit"
		android:theme="@style/GlifV3Theme.Light"
		android:theme="@style/GlifV3Theme.DayNight"
		android:exported="true"
		android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
		<activity android:name=".deviceinfo.StorageWizardFormatProgress"
		android:theme="@style/GlifV3Theme.Light"
		android:theme="@style/GlifV3Theme.DayNight"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardFormatSlow"
		android:theme="@style/GlifV3Theme.Light"
		android:theme="@style/GlifV3Theme.DayNight"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardMigrateConfirm"
		android:theme="@style/GlifV3Theme.Light"
		android:theme="@style/GlifV3Theme.DayNight"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardMigrateProgress"
		android:theme="@style/GlifV3Theme.Light"
		android:theme="@style/GlifV3Theme.DayNight"
		android:exported="true"
		android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
		<activity android:name=".deviceinfo.StorageWizardReady"
		android:theme="@style/GlifV3Theme.Light"
		android:theme="@style/GlifV3Theme.DayNight"
		android:exported="true"
		android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

res/layout/storage_wizard_init.xml

+18 −12

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		android:layout_width="144dp"
		android:layout_height="144dp"
		android:scaleType="centerInside"
		android:src="@drawable/ic_storage_wizard_internal" />
		android:src="@drawable/ic_storage_wizard_external" />
		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		@@ -48,20 +48,20 @@
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/sud_description_margin_bottom"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
		android:text="@string/storage_wizard_init_v2_internal_title" />
		android:text="@string/storage_wizard_init_v2_external_title" />
		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/sud_description_margin_bottom"
		android:textColor="?android:attr/textColorSecondary"
		android:text="@string/storage_wizard_init_v2_internal_summary" />
		android:text="@string/storage_wizard_init_v2_external_summary" />
		<Button
		android:id="@+id/storage_wizard_init_internal"
		android:id="@+id/storage_wizard_init_external"
		style="@style/SudGlifButton.Primary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/storage_wizard_init_v2_internal_action"
		android:onClick="onNavigateInternal" />
		android:text="@string/storage_wizard_init_v2_external_action"
		android:onClick="onNavigateExternal" />
		</LinearLayout>
		</LinearLayout>

		@@ -103,7 +103,7 @@
		android:layout_width="144dp"
		android:layout_height="144dp"
		android:scaleType="centerInside"
		android:src="@drawable/ic_storage_wizard_external" />
		android:src="@drawable/ic_storage_wizard_internal" />
		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		@@ -115,20 +115,26 @@
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/sud_description_margin_bottom"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
		android:text="@string/storage_wizard_init_v2_external_title" />
		android:text="@string/storage_wizard_init_v2_internal_title" />
		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/sud_description_margin_bottom"
		android:textColor="?android:attr/textColorSecondary"
		android:text="@string/storage_wizard_init_v2_external_summary" />
		android:text="@string/storage_wizard_init_v2_internal_summary" />
		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/sud_description_margin_bottom"
		android:textColor="?android:attr/colorError"
		android:text="@string/storage_warning_internal" />
		<Button
		android:id="@+id/storage_wizard_init_external"
		android:id="@+id/storage_wizard_init_internal"
		style="@style/SudGlifButton.Primary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/storage_wizard_init_v2_external_action"
		android:onClick="onNavigateExternal" />
		android:text="@string/storage_wizard_init_v2_internal_action"
		android:onClick="onNavigateInternal" />
		</LinearLayout>
		</LinearLayout>

res/values/cm_strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,9 @@
		<!-- Summary text for screen off UDFPS [CHAR LIMIT=NONE]-->
		<string name="ambient_display_screen_off_udfps_summary">To wake up your screen and unlock, long press your under-display fingerprint sensor.</string>

		<!-- Warning message for the sd card setup -->
		<string name="storage_warning_internal">Warning: This option may not work properly or lead to data loss and is therefore not recommended!</string>

		<!-- /e/ additions begin -->

		<!-- /e/ version -->

src/com/android/settings/SettingsActivity.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ import com.android.settings.homepage.SettingsHomepageActivity;
		import com.android.settings.homepage.SliceDeepLinkHomepageActivity;
		import com.android.settings.homepage.TopLevelSettings;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.password.PasswordUtils;
		import com.android.settings.wfd.WifiDisplaySettings;
		import com.android.settings.widget.SettingsMainSwitchBar;
		import com.android.settingslib.core.instrumentation.Instrumentable;
		@@ -150,6 +151,8 @@ public class SettingsActivity extends SettingsBaseActivity
		*/
		public static final String EXTRA_IS_FROM_SLICE = "is_from_slice";

		public static final String EXTRA_INITIAL_CALLING_PACKAGE = "initial_calling_package";

		/**
		* Personal or Work profile tab of {@link ProfileSelectFragment}
		* <p>0: Personal tab.
		@@ -399,6 +402,8 @@ public class SettingsActivity extends SettingsBaseActivity
		}

		private void launchHomepageForTwoPaneDeepLink(Intent intent) {
		intent.putExtra(EXTRA_INITIAL_CALLING_PACKAGE, PasswordUtils.getCallingAppPackageName(
		getActivityToken()));
		final Intent trampolineIntent;
		if (intent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) {
		// Get menu key for slice deep link case.
		@@ -459,6 +464,17 @@ public class SettingsActivity extends SettingsBaseActivity
		return true;
		}

		/** Returns the initial calling package name that launches the activity. */
		public String getInitialCallingPackage() {
		String callingPackage = PasswordUtils.getCallingAppPackageName(getActivityToken());
		if (!TextUtils.equals(callingPackage, getPackageName())) {
		return callingPackage;
		}

		String initialCallingPackage = getIntent().getStringExtra(EXTRA_INITIAL_CALLING_PACKAGE);
		return TextUtils.isEmpty(initialCallingPackage) ? callingPackage : initialCallingPackage;
		}

		/** Returns the initial fragment name that the activity will launch. */
		@VisibleForTesting
		public String getInitialFragmentName(Intent intent) {

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -58,9 +58,9 @@ import android.util.Log;
		import androidx.annotation.VisibleForTesting;

		import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.core.SettingsUIDeviceConfig;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.password.PasswordUtils;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.slices.SlicePreferenceController;
		import com.android.settingslib.search.SearchIndexable;
		@@ -104,8 +104,8 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
		super.onAttach(context);
		final boolean nearbyEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
		SettingsUIDeviceConfig.BT_NEAR_BY_SUGGESTION_ENABLED, true);
		String callingAppPackageName = PasswordUtils.getCallingAppPackageName(
		getActivity().getActivityToken());
		String callingAppPackageName = ((SettingsActivity) getActivity())
		.getInitialCallingPackage();
		String action = getIntent() != null ? getIntent().getAction() : "";
		if (DEBUG) {
		Log.d(TAG, "onAttach() calling package name is : " + callingAppPackageName