Merge "Refactor layout of ProcessStatsPreference" into main (3f2d009c) · Commits · e / os / android_packages_apps_Settings

res/layout/preference_process_stats.xml

0 → 100644

+100 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2024 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?android:attr/selectableItemBackground"
		android:gravity="center_vertical"
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<LinearLayout
		android:id="@+id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="start\|center_vertical"
		android:minWidth="@dimen/secondary_app_icon_size"
		android:orientation="horizontal"
		android:paddingEnd="16dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp">
		<ImageView
		android:id="@android:id/icon"
		android:layout_width="@dimen/secondary_app_icon_size"
		android:layout_height="@dimen/secondary_app_icon_size"/>
		</LinearLayout>

		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingTop="16dp"
		android:paddingBottom="16dp">

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:maxLines="2"
		android:hyphenationFrequency="normalFast"
		android:lineBreakWordStyle="phrase"
		android:textAppearance="?android:attr/textAppearanceListItem"/>

		<TextView
		android:id="@android:id/summary"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textDirection="locale"
		android:hyphenationFrequency="normalFast"
		android:lineBreakWordStyle="phrase"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"/>

		<TextView
		android:id="@+id/appendix"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:maxLines="1"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:visibility="gone"/>

		<ProgressBar
		android:id="@android:id/progress"
		style="?android:attr/progressBarStyleHorizontal"
		android:layout_width="match_parent"
		android:layout_height="4dp"
		android:layout_marginTop="4dp"
		android:max="100"
		android:visibility="gone"/>
		</LinearLayout>

		<LinearLayout
		android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="center_vertical\|end"
		android:minWidth="@dimen/two_target_min_width"
		android:orientation="vertical"/>

		</LinearLayout>

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

+33 −0

Original line number	Diff line number	Diff line
		@@ -21,16 +21,24 @@ import android.content.pm.PackageManager;
		import android.text.TextUtils;
		import android.text.format.Formatter;
		import android.util.Log;
		import android.view.View;
		import android.widget.ProgressBar;

		import androidx.preference.PreferenceViewHolder;

		import com.android.settings.R;
		import com.android.settingslib.widget.AppPreference;

		public class ProcessStatsPreference extends AppPreference {
		static final String TAG = "ProcessStatsPreference";

		private ProcStatsPackageEntry mEntry;
		private int mProgress;
		private boolean mProgressVisible;

		public ProcessStatsPreference(Context context) {
		super(context, null);
		setLayoutResource(R.layout.preference_process_stats);
		}

		public void init(ProcStatsPackageEntry entry, PackageManager pm, double maxMemory,
		@@ -56,4 +64,29 @@ public class ProcessStatsPreference extends AppPreference {
		public ProcStatsPackageEntry getEntry() {
		return mEntry;
		}

		/**
		* Sets the current progress.
		* @param amount the current progress
		*
		* @see ProgressBar#setProgress(int)
		*/
		public void setProgress(int amount) {
		mProgress = amount;
		mProgressVisible = true;
		notifyChanged();
		}

		@Override
		public void onBindViewHolder(PreferenceViewHolder view) {
		super.onBindViewHolder(view);

		final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
		if (mProgressVisible) {
		progress.setProgress(mProgress);
		progress.setVisibility(View.VISIBLE);
		} else {
		progress.setVisibility(View.GONE);
		}
		}
		}

tests/robotests/src/com/android/settings/applications/ProcessStatsPreferenceTest.java

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.applications;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;
		import android.view.View;

		import androidx.preference.PreferenceViewHolder;

		import com.android.settings.R;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;

		@RunWith(RobolectricTestRunner.class)
		public class ProcessStatsPreferenceTest {

		private Context mContext;
		private View mRootView;
		private ProcessStatsPreference mPref;
		private PreferenceViewHolder mHolder;

		@Before
		public void setUp() {
		mContext = RuntimeEnvironment.application;
		mRootView = View.inflate(mContext, R.layout.preference_process_stats, null /* parent */);
		mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
		mPref = new ProcessStatsPreference(mContext);
		}

		@Test
		public void setProgress_showProgress() {
		mPref.setProgress(1);
		mPref.onBindViewHolder(mHolder);

		assertThat(mHolder.findViewById(android.R.id.progress).getVisibility())
		.isEqualTo(View.VISIBLE);
		}

		@Test
		public void foobar_testName() {
		float iconSize = mContext.getResources().getDimension(
		com.android.settingslib.widget.theme.R.dimen.secondary_app_icon_size);
		assertThat(Float.floatToIntBits(iconSize)).isEqualTo(Float.floatToIntBits(32));
		}
		}