release-request-108343c4-ad88-44f9-aaa2-24d8b8a5c176-for-git_oc-mr1-release-4321077 snap-temp-L97000000100182150

Change-Id: I8b4c0880cec4a4a4eeb976bb00ab4305d16287e9
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ed4bb82..441e44b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -21,8 +21,6 @@
     <dimen name="seekbar_padding_top">10dp</dimen>
     <dimen name="switch_end_padding">5dp</dimen>
     <dimen name="double_icon_size">112dp</dimen>
-    <dimen name="double_line_item_height">256dp</dimen>
-    <dimen name="single_line_item_height">96dp</dimen>
     <dimen name="double_line_text_margin">4dp</dimen>
 
     <dimen name="action_bar_end_widget_margin_end">46dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fec1232..b61c427 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources>
     <style name="LineItem">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/line_item_height</item>
+        <item name="android:layout_height">@dimen/double_line_item_height</item>
         <item name="android:foreground">@drawable/car_list_item_background</item>
     </style>
 
diff --git a/src/com/android/car/settings/common/CarSettingActivity.java b/src/com/android/car/settings/common/CarSettingActivity.java
index 88bb33b..e79d60f 100644
--- a/src/com/android/car/settings/common/CarSettingActivity.java
+++ b/src/com/android/car/settings/common/CarSettingActivity.java
@@ -18,7 +18,6 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.MenuItem;
 
 import com.android.car.settings.R;
 import com.android.car.settings.home.HomepageFragment;