Snap for 7482982 from 2de946e584cad6b26a9683ed5008f26fbcbc3be3 to sc-d1-release (e2585851) · Commits · e / os / android_packages_apps_Settings

res/layout/manage_applications_apps.xml

+33 −34

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		limitations under the License.
		-->

		<FrameLayout
		<androidx.constraintlayout.widget.ConstraintLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		@@ -24,40 +24,39 @@
		android:id="@+id/pinned_header"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:elevation="2dp"/>

		<FrameLayout
		android:id="@+id/list_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone">
		android:elevation="2dp"
		settings:layout_constraintTop_toTopOf="parent"/>

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/apps_list"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="0dp"
		android:clipToPadding="false"
		android:scrollbars="none"
		android:visibility="invisible"
		settings:fastScrollEnabled="true"
		settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
		settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
		settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
		settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>
		settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
		settings:layout_constraintTop_toBottomOf="@id/pinned_header"
		settings:layout_constraintBottom_toBottomOf="parent"/>

		<TextView
		android:id="@android:id/empty"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="bottom\|center_horizontal"
		android:layout_gravity="center"
		android:layout_height="0dp"
		android:gravity="center"
		android:text="@string/no_applications"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:visibility="invisible"/>

		</FrameLayout>
		android:visibility="invisible"
		settings:layout_constraintTop_toTopOf="parent"
		settings:layout_constraintBottom_toBottomOf="parent"/>

		<include layout="@layout/loading_container"/>
		<include layout="@layout/loading_container"
		settings:layout_constraintTop_toBottomOf="@id/pinned_header"
		settings:layout_constraintBottom_toBottomOf="parent"/>

		</FrameLayout>
		</androidx.constraintlayout.widget.ConstraintLayout>

res/values/dimens.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -149,8 +149,6 @@
		<dimen name="wifi_assistant_height">182dp</dimen>
		<dimen name="wifi_assistant_image_top">32dp</dimen>
		<dimen name="wifi_assistant_image_start">24dp</dimen>
		<!-- appbar height is equal search bar height (48dp) plus search bar top and bottom margin -->
		<dimen name="app_bar_height">80dp</dimen>

		<!-- CryptKeeper top margin for password/pin screen -->
		<dimen name="crypt_keeper_password_top_margin">88dip</dimen>

res/xml/security_lockscreen_settings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,12 @@
		android:title="@string/owner_info_settings_title"
		android:summary="@string/owner_info_settings_summary" />

		<SwitchPreference
		android:key="security_setting_lockdown_enabled"
		android:title="@string/lockdown_settings_title"
		android:summary="@string/lockdown_settings_summary"
		settings:controller="com.android.settings.security.LockdownButtonPreferenceController" />

		<SwitchPreference
		android:key="lockscreen_privacy_wallet_switch"
		android:title="@string/lockscreen_privacy_wallet_setting_toggle"

src/com/android/settings/Utils.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -77,7 +77,6 @@ import android.provider.ContactsContract.Contacts;
		import android.provider.ContactsContract.Data;
		import android.provider.ContactsContract.Profile;
		import android.provider.ContactsContract.RawContacts;
		import android.provider.Settings;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.Spannable;
		@@ -164,9 +163,6 @@ public final class Utils extends com.android.settingslib.Utils {
		public static final String PROPERTY_HIBERNATION_TARGETS_PRE_S_APPS =
		"app_hibernation_targets_pre_s_apps";

		/** Whether or not Settings Shared Axis transition is enabled */
		public static final String SETTINGS_SHARED_AXIS_ENABLED = "settings_shared_axis_enabled";

		/**
		* Finds a matching activity for a preference's intent. If a matching
		* activity is not found, it will remove the preference.
		@@ -1225,9 +1221,4 @@ public final class Utils extends com.android.settingslib.Utils {
		public static boolean isProviderModelEnabled(Context context) {
		return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
		}

		public static boolean isPageTransitionEnabled(Context context) {
		return Settings.Global.getInt(context.getContentResolver(),
		SETTINGS_SHARED_AXIS_ENABLED, 0) == 1;
		}
		}

src/com/android/settings/applications/RunningServices.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,11 @@ public class RunningServices extends SettingsPreferenceFragment {
		public void onResume() {
		super.onResume();
		boolean haveData = mRunningProcessesView.doResume(this, mRunningProcessesAvail);
		mLoadingViewController.handleLoadingContainer(haveData /* done /, false / animate */);
		if (haveData) {
		mLoadingViewController.showContent(false /* animate */);
		} else {
		mLoadingViewController.showLoadingView();
		}
		}

		@Override