From b335e96d2aae65a403040f6a6960958433e6c8ec Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Wed, 3 Apr 2019 13:49:26 +0800
Subject: [PATCH] Micro cleanup and refactoring

- remove unused dimen resources
- remove unused and refactor codes

Test: make RunSettingsRoboTests -j
Change-Id: Ic2a5b16323667741d048e20e3db8da3fb4dc348a
---
 res/values/dimens.xml                            | 16 ----------------
 .../homepage/SettingsHomepageActivity.java       |  2 +-
 .../slices/SliceFullCardRendererHelper.java      |  7 -------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7d5ca662e1d..f1265253c4f 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -319,14 +319,6 @@
     <dimen name="screen_pinning_padding_start">64dp</dimen>
     <dimen name="screen_pinning_padding_end">64dp</dimen>
 
-    <!-- Suggestion/condition header padding -->
-    <dimen name="suggestion_condition_header_padding_collapsed">10dp</dimen>
-    <dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>
-    <dimen name="condition_header_height">36dp</dimen>
-
-    <!-- Condition cards size and padding -->
-    <dimen name="condition_card_elevation">2dp</dimen>
-
     <!-- Padding for the reset screens -->
     <dimen name="reset_checkbox_padding_end">8dp</dimen>
     <dimen name="reset_checkbox_title_padding_top">12dp</dimen>
@@ -334,12 +326,6 @@
     <dimen name="reset_checkbox_title_text_size">18sp</dimen>
     <dimen name="reset_checkbox_summary_text_size">14sp</dimen>
 
-    <!-- Bottombar size and padding -->
-    <dimen name="homepage_bottomsheet_height">90dp</dimen>
-    <dimen name="homepage_bottombar_height">56dp</dimen>
-    <dimen name="homepage_bottombar_top_margin">34dp</dimen>
-    <dimen name="homepage_bottombar_fab_cradle">68dp</dimen>
-
     <!-- Homepage cards size and padding -->
     <dimen name="homepage_card_icon_size">24dp</dimen>
     <dimen name="homepage_card_vertical_margin">8dp</dimen>
@@ -369,8 +355,6 @@
     <dimen name="homepage_card_dismissal_button_margin_end">6dp</dimen>
 
     <!-- Horizontal divider size and margin -->
-    <dimen name="horizontal_divider_margin_top">4dp</dimen>
-    <dimen name="horizontal_divider_margin_bottom">8dp</dimen>
     <dimen name="horizontal_divider_height">.75dp</dimen>
 
     <!-- Vertical divider size -->
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 9b83f88e832..6d16d7f56cb 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -84,7 +84,7 @@ public class SettingsHomepageActivity extends SettingsBaseActivity {
                         View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
         );
 
-        getWindow().setStatusBarColor(getResources().getColor(R.color.homepage_status_bar_color));
+        getWindow().setStatusBarColor(getColor(R.color.homepage_status_bar_color));
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
index 1e1bde4981d..35845783c73 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
@@ -17,14 +17,10 @@
 package com.android.settings.homepage.contextualcards.slices;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.widget.EventInfo;
 import androidx.slice.widget.SliceView;
 
 import com.android.settings.R;
@@ -32,13 +28,10 @@ import com.android.settings.homepage.contextualcards.ContextualCard;
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 
-import java.util.Set;
-
 /**
  * Card renderer helper for {@link ContextualCard} built as slice full card.
  */
 class SliceFullCardRendererHelper {
-    private static final String TAG = "SliceFCRendererHelper";
 
     private final Context mContext;