Removing overshadowing variable from superclass

Changing names of variables from subclass
to make them different from variables in superclass
(which will remove Prone warnings)

Bug: 
Change-Id: I3591cb6b64062c94e9f84f30dd505d0c31fbf3d2
Reviewed-on: https://chromium-review.googlesource.com/802435Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Cr-Commit-Position: refs/heads/master@{#520962}

chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java

@@ -56,7 +56,7 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
     // Controls for completed downloads.
     private View mLayoutCompleted;
     private TextView mFilenameCompletedView;
-    private TextView mDescriptionView;
+    private TextView mDescriptionCompletedView;
 
     // Controls for in-progress downloads.
     private View mLayoutInProgress;
@@ -103,7 +103,7 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
         mLayoutInProgress = findViewById(R.id.progress_layout);
 
         mFilenameCompletedView = (TextView) findViewById(R.id.filename_completed_view);
-        mDescriptionView = (TextView) findViewById(R.id.description_view);
+        mDescriptionCompletedView = (TextView) findViewById(R.id.description_view);
 
         mFilenameInProgressView = (TextView) findViewById(R.id.filename_progress_view);
         mDownloadStatusView = (TextView) findViewById(R.id.status_view);
@@ -189,13 +189,13 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
 
         if (mThumbnailBitmap == null) updateIconView();
 
-        Context context = mDescriptionView.getContext();
+        Context context = mDescriptionCompletedView.getContext();
         mFilenameCompletedView.setText(item.getDisplayFileName());
         mFilenameInProgressView.setText(item.getDisplayFileName());
 
         String description = String.format(Locale.getDefault(), "%s - %s",
                 Formatter.formatFileSize(context, item.getFileSize()), item.getDisplayHostname());
-        mDescriptionView.setText(description);
+        mDescriptionCompletedView.setText(description);
 
         if (item.isComplete()) {
             showLayout(mLayoutCompleted);

chrome/android/java/src/org/chromium/chrome/browser/download/ui/OfflineGroupHeaderView.java

@@ -41,9 +41,9 @@ public class OfflineGroupHeaderView
     private DownloadHistoryAdapter mAdapter;
     private DownloadItemSelectionDelegate mSelectionDelegate;
 
-    private TextView mDescriptionView;
+    private TextView mDescriptionTextView;
     private ImageView mExpandImage;
-    private TintedImageView mIconView;
+    private TintedImageView mIconImageView;
 
     public OfflineGroupHeaderView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -65,8 +65,8 @@ public class OfflineGroupHeaderView
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mIconView = (TintedImageView) findViewById(R.id.icon_view);
-        mDescriptionView = (TextView) findViewById(R.id.description);
+        mIconImageView = (TintedImageView) findViewById(R.id.icon_view);
+        mDescriptionTextView = (TextView) findViewById(R.id.description);
         mExpandImage = (ImageView) findViewById(R.id.expand_icon);
     }
 
@@ -102,7 +102,7 @@ public class OfflineGroupHeaderView
         String description = String.format(Locale.getDefault(), "%s - %s",
                 Formatter.formatFileSize(getContext(), header.getTotalFileSize()),
                 getContext().getString(R.string.download_manager_offline_header_description));
-        mDescriptionView.setText(description);
+        mDescriptionTextView.setText(description);
         updateExpandIcon(header.isExpanded());
         setChecked(mSelectionDelegate.isHeaderSelected(header));
     }
@@ -117,26 +117,26 @@ public class OfflineGroupHeaderView
     private void updateCheckIcon(boolean checked) {
         if (checked) {
             if (FeatureUtilities.isChromeHomeEnabled()) {
-                mIconView.setBackgroundResource(mIconBackgroundResId);
-                mIconView.getBackground().setLevel(
+                mIconImageView.setBackgroundResource(mIconBackgroundResId);
+                mIconImageView.getBackground().setLevel(
                         getResources().getInteger(R.integer.list_item_level_selected));
             } else {
-                mIconView.setBackgroundColor(mIconBackgroundColorSelected);
+                mIconImageView.setBackgroundColor(mIconBackgroundColorSelected);
             }
 
-            mIconView.setImageResource(R.drawable.ic_check_googblue_24dp);
-            mIconView.setTint(mCheckedIconForegroundColorList);
+            mIconImageView.setImageResource(R.drawable.ic_check_googblue_24dp);
+            mIconImageView.setTint(mCheckedIconForegroundColorList);
         } else {
             if (FeatureUtilities.isChromeHomeEnabled()) {
-                mIconView.setBackgroundResource(mIconBackgroundResId);
-                mIconView.getBackground().setLevel(
+                mIconImageView.setBackgroundResource(mIconBackgroundResId);
+                mIconImageView.getBackground().setLevel(
                         getResources().getInteger(R.integer.list_item_level_default));
             } else {
-                mIconView.setBackgroundColor(mIconBackgroundColor);
+                mIconImageView.setBackgroundColor(mIconBackgroundColor);
             }
 
-            mIconView.setImageResource(R.drawable.ic_chrome);
-            mIconView.setTint(mIconForegroundColorList);
+            mIconImageView.setImageResource(R.drawable.ic_chrome);
+            mIconImageView.setTint(mIconForegroundColorList);
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/widget/OverviewListLayout.java

@@ -34,7 +34,7 @@ import org.chromium.chrome.browser.widget.accessibility.AccessibilityTabModelWra
  */
 public class OverviewListLayout extends Layout implements AccessibilityTabModelAdapterListener {
     private AccessibilityTabModelWrapper mTabModelWrapper;
-    private final float mDpToPx;
+    private final float mDensity;
     private final BlackHoleEventFilter mBlackHoleEventFilter;
     private final SceneLayer mSceneLayer;
 
@@ -42,7 +42,7 @@ public class OverviewListLayout extends Layout implements AccessibilityTabModelA
             Context context, LayoutUpdateHost updateHost, LayoutRenderHost renderHost) {
         super(context, updateHost, renderHost);
         mBlackHoleEventFilter = new BlackHoleEventFilter(context);
-        mDpToPx = context.getResources().getDisplayMetrics().density;
+        mDensity = context.getResources().getDisplayMetrics().density;
         mSceneLayer = new SceneLayer();
     }
 
@@ -81,7 +81,7 @@ public class OverviewListLayout extends Layout implements AccessibilityTabModelA
                 (FrameLayout.LayoutParams) mTabModelWrapper.getLayoutParams();
         if (params == null) return;
 
-        int margin = (int) ((getHeight() - getHeightMinusBrowserControls()) * mDpToPx);
+        int margin = (int) ((getHeight() - getHeightMinusBrowserControls()) * mDensity);
         if (FeatureUtilities.isChromeHomeEnabled()) {
             params.bottomMargin = margin;
         } else {