Merge "Fix some UX polish bugs" into sc-dev (a59bdc6e) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/people_tile_medium_empty.xml

+41 −49

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:theme="@android:style/Theme.DeviceDefault.DayNight"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -22,20 +22,15 @@
		<LinearLayout
		android:background="@drawable/people_space_tile_view_card"
		android:id="@+id/item"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<LinearLayout
		android:orientation="horizontal"
		android:gravity="center"
		android:layout_gravity="center"
		android:paddingVertical="2dp"
		android:paddingHorizontal="8dp"
		android:paddingHorizontal="16dp"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<ImageView
		android:id="@+id/person_icon"
		android:layout_marginTop="-2dp"
		android:layout_marginStart="-2dp"
		android:layout_width="64dp"
		android:layout_height="64dp" />
		<ImageView
		@@ -50,7 +45,6 @@
		android:gravity="top"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<TextView
		android:id="@+id/name"
		android:text="@string/empty_user_name"
		@@ -61,7 +55,6 @@
		android:ellipsize="end"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />

		<TextView
		android:id="@+id/last_interaction"
		android:text="@string/empty_status"
		@@ -74,5 +67,4 @@
		android:ellipsize="end" />
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>
		No newline at end of file
		</FrameLayout>
		No newline at end of file

packages/SystemUI/res/layout/people_tile_medium_with_content.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@
		android:gravity="bottom"
		android:layout_gravity="center_vertical"
		android:orientation="horizontal"
		android:paddingTop="4dp"
		android:paddingTop="2dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipToOutline="true">

packages/SystemUI/res/layout/people_tile_small.xml

+3 −5

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		<LinearLayout
		android:id="@+id/item"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:background="@drawable/people_space_tile_view_card"
		android:orientation="vertical"
		@@ -42,12 +42,12 @@
		android:tint="?android:attr/colorAccent"
		android:layout_gravity="center"
		android:layout_width="18dp"
		android:layout_height="22dp"
		android:layout_weight="1" />
		android:layout_height="22dp" />

		<TextView
		android:id="@+id/messages_count"
		android:layout_gravity="center"
		android:gravity="center"
		android:paddingStart="8dp"
		android:paddingEnd="8dp"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
		@@ -59,7 +59,6 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:visibility="gone"
		android:layout_weight="1"
		/>

		<TextView
		@@ -67,7 +66,6 @@
		android:layout_gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:ellipsize="end"
		android:maxLines="1"
		android:paddingHorizontal="4dp"

packages/SystemUI/res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1397,6 +1397,7 @@
		<dimen name="max_people_avatar_size_for_large_content">64dp</dimen>
		<dimen name="max_people_avatar_size">108dp</dimen>
		<dimen name="name_text_size_for_small">14sp</dimen>
		<dimen name="name_text_size_for_medium">14sp</dimen>
		<dimen name="name_text_size_for_large">24sp</dimen>
		<dimen name="content_text_size_for_medium">12sp</dimen>
		<dimen name="content_text_size_for_large">14sp</dimen>

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java

+0 −38

Original line number	Diff line number	Diff line
		@@ -36,9 +36,6 @@ import android.graphics.Bitmap;
		import android.graphics.Canvas;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.icu.text.MeasureFormat;
		import android.icu.util.Measure;
		import android.icu.util.MeasureUnit;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Parcelable;
		@@ -65,7 +62,6 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;

		import java.text.SimpleDateFormat;
		import java.time.Duration;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		@@ -73,7 +69,6 @@ import java.util.Comparator;
		import java.util.Date;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Locale;
		import java.util.Map;
		import java.util.Objects;
		import java.util.Set;
		@@ -85,9 +80,6 @@ public class PeopleSpaceUtils {
		/** Turns on debugging information about People Space. */
		public static final boolean DEBUG = true;
		private static final String TAG = "PeopleSpaceUtils";
		private static final int DAYS_IN_A_WEEK = 7;
		private static final int MIN_HOUR = 1;
		private static final int ONE_DAY = 1;
		public static final String PACKAGE_NAME = "package_name";
		public static final String USER_ID = "user_id";
		public static final String SHORTCUT_ID = "shortcut_id";
		@@ -426,36 +418,6 @@ public class PeopleSpaceUtils {
		return bitmap;
		}

		/** Returns a readable status describing the {@code lastInteraction}. */
		public static String getLastInteractionString(Context context, long lastInteraction) {
		if (lastInteraction == 0L) {
		Log.e(TAG, "Could not get valid last interaction");
		return context.getString(R.string.basic_status);
		}
		long now = System.currentTimeMillis();
		Duration durationSinceLastInteraction = Duration.ofMillis(now - lastInteraction);
		MeasureFormat formatter = MeasureFormat.getInstance(Locale.getDefault(),
		MeasureFormat.FormatWidth.WIDE);
		if (durationSinceLastInteraction.toHours() < MIN_HOUR) {
		return context.getString(R.string.timestamp, formatter.formatMeasures(
		new Measure(durationSinceLastInteraction.toMinutes(), MeasureUnit.MINUTE)));
		} else if (durationSinceLastInteraction.toDays() < ONE_DAY) {
		return context.getString(R.string.timestamp, formatter.formatMeasures(
		new Measure(durationSinceLastInteraction.toHours(),
		MeasureUnit.HOUR)));
		} else if (durationSinceLastInteraction.toDays() < DAYS_IN_A_WEEK) {
		return context.getString(R.string.timestamp, formatter.formatMeasures(
		new Measure(durationSinceLastInteraction.toHours(),
		MeasureUnit.DAY)));
		} else {
		return context.getString(durationSinceLastInteraction.toDays() == DAYS_IN_A_WEEK
		? R.string.timestamp : R.string.over_timestamp,
		formatter.formatMeasures(
		new Measure(durationSinceLastInteraction.toDays() / DAYS_IN_A_WEEK,
		MeasureUnit.WEEK)));
		}
		}

		/**
		* Returns whether the {@code conversation} should be kept for display in the People Space.
		*