Merge "Remove the jump out icon under the app row." (db8371c2) · Commits · e / os / android_packages_apps_DocumentsUI

res/layout/apps_item.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -56,13 +56,4 @@
		android:ellipsize="end"
		android:gravity="center"/>

		<ImageView
		android:id="@+id/exit_icon"
		android:layout_width="@dimen/apps_row_exit_icon_size"
		android:layout_height="@dimen/apps_row_exit_icon_size"
		android:layout_marginTop="@dimen/apps_row_exit_icon_margin_top"
		android:scaleType="centerInside"
		android:src="@drawable/ic_exit_to_app"
		android:tint="?android:textColorSecondary"/>

		</LinearLayout>
		No newline at end of file

src/com/android/documentsui/dirlist/AppsRowItemData.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ public abstract class AppsRowItemData {

		protected abstract Drawable getIconDrawable(Context context);
		protected abstract void onClicked();
		protected abstract boolean showExitIcon();

		public static class AppData extends AppsRowItemData {

		@@ -78,11 +77,6 @@ public abstract class AppsRowItemData {
		protected void onClicked() {
		mActionHandler.openRoot(mResolveInfo);
		}

		@Override
		protected boolean showExitIcon() {
		return true;
		}
		}

		public static class RootData extends AppsRowItemData {
		@@ -103,10 +97,5 @@ public abstract class AppsRowItemData {
		protected void onClicked() {
		mActionHandler.openRoot(mRootInfo);
		}

		@Override
		protected boolean showExitIcon() {
		return false;
		}
		}
		}

src/com/android/documentsui/dirlist/AppsRowManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -106,13 +106,11 @@ public class AppsRowManager {
		final ImageView app_icon = view.findViewById(R.id.app_icon);
		final TextView title = view.findViewById(android.R.id.title);
		final TextView summary = view.findViewById(R.id.summary);
		final ImageView exit_icon = view.findViewById(R.id.exit_icon);

		app_icon.setImageDrawable(data.getIconDrawable(view.getContext()));
		title.setText(data.getTitle());
		summary.setText(data.getSummary());
		summary.setVisibility(data.getSummary() != null ? View.VISIBLE : View.GONE);
		exit_icon.setVisibility(data.showExitIcon() ? View.VISIBLE : View.GONE);
		view.setOnClickListener(v -> data.onClicked());
		}
		}

tests/unit/com/android/documentsui/dirlist/AppsRowManagerTest.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.documentsui.dirlist;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertNull;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.Mockito.mock;
		@@ -91,12 +90,10 @@ public class AppsRowManagerTest {
		assertEquals(chipDataList.size(), rootList.size());
		assertEquals(TestProvidersAccess.INSPECTOR.title, chipDataList.get(0).getTitle());
		assertEquals(null, chipDataList.get(0).getSummary());
		assertFalse(chipDataList.get(0).showExitIcon());
		assertEquals(TestProvidersAccess.PICKLES.title, chipDataList.get(1).getTitle());
		assertEquals(null, chipDataList.get(1).getSummary());
		assertEquals(TestProvidersAccess.PICKLES.summary, chipDataList.get(2).getSummary());
		assertEquals(TestProvidersAccess.PICKLES.summary, chipDataList.get(3).getSummary());
		assertFalse(chipDataList.get(1).showExitIcon());
		}

		@Test
		@@ -114,11 +111,9 @@ public class AppsRowManagerTest {
		assertEquals(chipDataList.size(), hybridList.size());
		assertEquals(TestProvidersAccess.INSPECTOR.title, chipDataList.get(0).getTitle());
		assertTrue(chipDataList.get(0) instanceof AppsRowItemData.RootData);
		assertFalse(chipDataList.get(0).showExitIcon());
		assertEquals(TestProvidersAccess.PICKLES.title, chipDataList.get(1).getTitle());
		assertNull(chipDataList.get(1).getSummary());
		assertTrue(chipDataList.get(1) instanceof AppsRowItemData.AppData);
		assertTrue(chipDataList.get(1).showExitIcon());
		}

		@Test