release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-4176727 snap-temp-L91200000081901352
Change-Id: I254fee7fc96db120cbf931e2a247bf0f790aaf1b
diff --git a/res/layout/lens_list.xml b/res/layout/lens_list.xml
index 37809cd..311b9ee 100644
--- a/res/layout/lens_list.xml
+++ b/res/layout/lens_list.xml
@@ -26,8 +26,9 @@
android:id="@+id/list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/lens_header_height"
app:offsetRows="true"
- android:layout_marginTop="@dimen/lens_header_height" />
+ app:showDivider="false" />
<RelativeLayout
android:id="@+id/no_app_installed"
android:layout_width="match_parent"
diff --git a/res/layout/resolver_list.xml b/res/layout/resolver_list.xml
index 1d5e1f8..9d63f3d 100644
--- a/res/layout/resolver_list.xml
+++ b/res/layout/resolver_list.xml
@@ -55,8 +55,9 @@
android:id="@+id/list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/lens_header_height"
app:offsetRows="true"
- android:layout_marginTop="@dimen/lens_header_height" />
+ app:showDivider="false" />
<RelativeLayout
android:id="@+id/no_app_installed"
android:layout_width="match_parent"
diff --git a/src/com/android/support/car/lenspicker/LensPickerActivity.java b/src/com/android/support/car/lenspicker/LensPickerActivity.java
index f0a281c..d47ae28 100644
--- a/src/com/android/support/car/lenspicker/LensPickerActivity.java
+++ b/src/com/android/support/car/lenspicker/LensPickerActivity.java
@@ -16,15 +16,12 @@
package com.android.support.car.lenspicker;
import android.app.Activity;
-import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.graphics.Canvas;
import android.os.Bundle;
import android.service.media.MediaBrowserService;
-import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -59,7 +56,6 @@
setContentView(R.layout.lens_list);
mPagedListView = (PagedListView) findViewById(R.id.list_view);
- mPagedListView.setDefaultItemDecoration(new ItemDecoration(this));
// Set this to light mode, since the scroll bar buttons always appear
// on top of a dark scrim.
mPagedListView.setLightMode();
@@ -213,17 +209,4 @@
LensPickerUtils.launch(this /* context */, mSharedPrefs, facetId, packageName,
launchIntent);
}
-
- /**
- * Default {@link com.android.car.view.PagedListView.Decoration} for the {@link PagedListView}
- * that removes the dividing lines between items.
- */
- private static class ItemDecoration extends PagedListView.DividerDecoration {
- public ItemDecoration(Context context) {
- super(context);
- }
-
- @Override
- public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {}
- }
}
diff --git a/src/com/android/support/car/lenspicker/LensResolverActivity.java b/src/com/android/support/car/lenspicker/LensResolverActivity.java
index f6b7527..6b0892a 100644
--- a/src/com/android/support/car/lenspicker/LensResolverActivity.java
+++ b/src/com/android/support/car/lenspicker/LensResolverActivity.java
@@ -15,25 +15,25 @@
*/
package com.android.support.car.lenspicker;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
import android.app.Activity;
import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.graphics.Canvas;
import android.net.Uri;
import android.os.Bundle;
import android.os.PatternMatcher;
import android.provider.MediaStore;
import android.support.annotation.StringRes;
-import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.view.Window;
import android.widget.CheckBox;
import android.widget.TextView;
+
import com.android.car.stream.ui.ColumnCalculator;
import com.android.car.view.PagedListView;
@@ -41,8 +41,6 @@
import java.util.List;
import java.util.Set;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
/**
* An activity that is displayed when the system attempts to start an Intent for which there is
* more than one matching activity, allowing the user to decide which to go to.
@@ -122,7 +120,6 @@
mAlwaysCheckbox = (CheckBox) findViewById(R.id.always_checkbox);
PagedListView pagedListView = (PagedListView) findViewById(R.id.list_view);
- pagedListView.setDefaultItemDecoration(new ItemDecoration(this /* context */));
pagedListView.setLightMode();
ResolverAdapter adapter = new ResolverAdapter(this /* context */, infos);
@@ -298,19 +295,6 @@
}
/**
- * Default {@link PagedListView.Decoration} for the {@link PagedListView}
- * that removes the dividing lines between items.
- */
- private static class ItemDecoration extends PagedListView.DividerDecoration {
- public ItemDecoration(Context context) {
- super(context);
- }
-
- @Override
- public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {}
- }
-
- /**
* An enum mapping different Intent actions to the strings that should be displayed that
* explain to the user what this ResolverActivity is doing.
*/
