From e34153973d790ec38d5f789ced6522905bfc42fb Mon Sep 17 00:00:00 2001 From: Chris Kitching Date: Sun, 3 Aug 2014 21:06:05 -0700 Subject: [PATCH] Bug 1047971: Delete redundant initialisers-to-default-values from constructors r=rnewman --- mobile/android/base/ContactService.java | 1 - mobile/android/base/GeckoSmsManager.java | 1 - mobile/android/base/MemoryMonitor.java | 1 - mobile/android/base/Tab.java | 13 ------------- mobile/android/base/TextSelectionHandle.java | 1 - mobile/android/base/animation/AnimatorProxy.java | 2 -- mobile/android/base/animation/PropertyAnimator.java | 1 - mobile/android/base/db/LocalBrowserDB.java | 3 --- mobile/android/base/gfx/DrawTimingQueue.java | 1 - mobile/android/base/gfx/GeckoLayerClient.java | 2 -- mobile/android/base/gfx/JavaPanZoomController.java | 1 - mobile/android/base/gfx/ViewTransform.java | 6 ------ mobile/android/base/home/BrowserSearch.java | 1 - mobile/android/base/home/HomeConfig.java | 2 -- mobile/android/base/home/SuggestClient.java | 1 - mobile/android/base/home/TopSitesGridView.java | 2 -- mobile/android/base/home/TopSitesPanel.java | 4 ---- mobile/android/base/menu/GeckoMenu.java | 1 - mobile/android/base/mozglue/NativeZip.java | 1 - mobile/android/base/tabspanel/TabsPanel.java | 4 ---- mobile/android/base/tabspanel/TabsTray.java | 2 -- mobile/android/base/toolbar/BrowserToolbar.java | 6 ++---- mobile/android/base/toolbar/ToolbarTitlePrefs.java | 1 - mobile/android/base/widget/TabRow.java | 1 - 24 files changed, 2 insertions(+), 57 deletions(-) diff --git a/mobile/android/base/ContactService.java b/mobile/android/base/ContactService.java index 297b3824e5f..7b3dedfc083 100644 --- a/mobile/android/base/ContactService.java +++ b/mobile/android/base/ContactService.java @@ -97,7 +97,6 @@ public class ContactService implements GeckoEventListener { mEventDispatcher = eventDispatcher; mActivity = activity; mContentResolver = mActivity.getContentResolver(); - mGotDeviceAccount = false; EventDispatcher.getInstance().registerGeckoThreadListener(this, "Android:Contacts:Clear", diff --git a/mobile/android/base/GeckoSmsManager.java b/mobile/android/base/GeckoSmsManager.java index b248f258ade..a68286cbe74 100644 --- a/mobile/android/base/GeckoSmsManager.java +++ b/mobile/android/base/GeckoSmsManager.java @@ -74,7 +74,6 @@ class Envelope public Envelope(int aId, int aParts) { mId = aId; mMessageId = -1; - mMessageTimestamp = 0; mError = GeckoSmsManager.kNoError; int size = Envelope.SubParts.values().length; diff --git a/mobile/android/base/MemoryMonitor.java b/mobile/android/base/MemoryMonitor.java index 44e39fb95a4..9664d634895 100644 --- a/mobile/android/base/MemoryMonitor.java +++ b/mobile/android/base/MemoryMonitor.java @@ -61,7 +61,6 @@ class MemoryMonitor extends BroadcastReceiver { private MemoryMonitor() { mPressureDecrementer = new PressureDecrementer(); mMemoryPressure = MEMORY_PRESSURE_NONE; - mStoragePressure = false; } public void init(final Context context) { diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java index 0b68368495b..6fac6ebc19b 100644 --- a/mobile/android/base/Tab.java +++ b/mobile/android/base/Tab.java @@ -96,27 +96,14 @@ public class Tab { public Tab(Context context, int id, String url, boolean external, int parentId, String title) { mAppContext = context.getApplicationContext(); mId = id; - mLastUsed = 0; mUrl = url; mBaseDomain = ""; mUserSearch = ""; mExternal = external; mParentId = parentId; mTitle = title == null ? "" : title; - mFavicon = null; - mFaviconUrl = null; - mFaviconSize = 0; - mHasFeeds = false; - mHasOpenSearch = false; mSiteIdentity = new SiteIdentity(); - mReaderEnabled = false; - mEnteringReaderMode = false; - mThumbnail = null; mHistoryIndex = -1; - mHistorySize = 0; - mBookmark = false; - mReadingListItem = false; - mFaviconLoadId = 0; mContentType = ""; mZoomConstraints = new ZoomConstraints(false); mPluginViews = new ArrayList(); diff --git a/mobile/android/base/TextSelectionHandle.java b/mobile/android/base/TextSelectionHandle.java index ceb837d91fc..78762358ef3 100644 --- a/mobile/android/base/TextSelectionHandle.java +++ b/mobile/android/base/TextSelectionHandle.java @@ -57,7 +57,6 @@ class TextSelectionHandle extends ImageView implements View.OnTouchListener { else mHandleType = HandleType.END; - mIsRTL = false; mGeckoPoint = new PointF(0.0f, 0.0f); mWidth = getResources().getDimensionPixelSize(R.dimen.text_selection_handle_width); diff --git a/mobile/android/base/animation/AnimatorProxy.java b/mobile/android/base/animation/AnimatorProxy.java index e2b5d0a06ca..dee3b04b2b5 100644 --- a/mobile/android/base/animation/AnimatorProxy.java +++ b/mobile/android/base/animation/AnimatorProxy.java @@ -162,8 +162,6 @@ class AnimatorProxy { mTempMatrix = new Matrix(); mAlpha = 1; - mTranslationX = 0; - mTranslationY = 0; loadCurrentTransformation(view); diff --git a/mobile/android/base/animation/PropertyAnimator.java b/mobile/android/base/animation/PropertyAnimator.java index 6e8e1ae701c..b4657729c02 100644 --- a/mobile/android/base/animation/PropertyAnimator.java +++ b/mobile/android/base/animation/PropertyAnimator.java @@ -66,7 +66,6 @@ public class PropertyAnimator implements Runnable { mElementsList = new ArrayList(); mFramePoster = FramePoster.create(this); mUseHardwareLayer = true; - mListeners = null; } public void setUseHardwareLayer(boolean useHardwareLayer) { diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java index c9934c24c29..4de255b1767 100644 --- a/mobile/android/base/db/LocalBrowserDB.java +++ b/mobile/android/base/db/LocalBrowserDB.java @@ -96,7 +96,6 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface { public LocalBrowserDB(String profile) { mProfile = profile; mFolderIdMap = new HashMap(); - mDesktopBookmarksExist = null; mBookmarksUriWithProfile = appendProfile(Bookmarks.CONTENT_URI); mParentsUriWithProfile = appendProfile(Bookmarks.PARENTS_CONTENT_URI); @@ -1456,8 +1455,6 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface { public SpecialFoldersCursorWrapper(Cursor c, boolean showDesktopBookmarks) { super(c); - mIndexOffset = 0; - if (showDesktopBookmarks) { mDesktopBookmarksIndex = mIndexOffset; mIndexOffset++; diff --git a/mobile/android/base/gfx/DrawTimingQueue.java b/mobile/android/base/gfx/DrawTimingQueue.java index ce868f18ce2..c6c676b0cd6 100644 --- a/mobile/android/base/gfx/DrawTimingQueue.java +++ b/mobile/android/base/gfx/DrawTimingQueue.java @@ -37,7 +37,6 @@ final class DrawTimingQueue { mMetrics = new DisplayPortMetrics[BUFFER_SIZE]; mTimestamps = new long[BUFFER_SIZE]; mHead = BUFFER_SIZE - 1; - mTail = 0; } /** diff --git a/mobile/android/base/gfx/GeckoLayerClient.java b/mobile/android/base/gfx/GeckoLayerClient.java index 9b71ca8104f..7f3178397f5 100644 --- a/mobile/android/base/gfx/GeckoLayerClient.java +++ b/mobile/android/base/gfx/GeckoLayerClient.java @@ -118,8 +118,6 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget mCurrentViewTransformMargins = new RectF(); mProgressiveUpdateData = new ProgressiveUpdateData(); mProgressiveUpdateDisplayPort = new DisplayPortMetrics(); - mLastProgressiveUpdateWasLowPrecision = false; - mProgressiveUpdateWasInDanger = false; mForceRedraw = true; DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); diff --git a/mobile/android/base/gfx/JavaPanZoomController.java b/mobile/android/base/gfx/JavaPanZoomController.java index 6023b0c4a6d..041bfa5b5fa 100644 --- a/mobile/android/base/gfx/JavaPanZoomController.java +++ b/mobile/android/base/gfx/JavaPanZoomController.java @@ -155,7 +155,6 @@ class JavaPanZoomController String[] prefs = { "ui.scrolling.axis_lock_mode", "ui.scrolling.negate_wheel_scrollY", "ui.scrolling.gamepad_dead_zone" }; - mNegateWheelScrollY = false; PrefsHelper.getPrefs(prefs, new PrefsHelper.PrefHandlerBase() { @Override public void prefValue(String pref, String value) { if (pref.equals("ui.scrolling.axis_lock_mode")) { diff --git a/mobile/android/base/gfx/ViewTransform.java b/mobile/android/base/gfx/ViewTransform.java index 7243aef6dc9..a9eec571804 100644 --- a/mobile/android/base/gfx/ViewTransform.java +++ b/mobile/android/base/gfx/ViewTransform.java @@ -23,12 +23,6 @@ public class ViewTransform { x = inX; y = inY; scale = inScale; - fixedLayerMarginLeft = 0; - fixedLayerMarginTop = 0; - fixedLayerMarginRight = 0; - fixedLayerMarginBottom = 0; - offsetX = 0; - offsetY = 0; } } diff --git a/mobile/android/base/home/BrowserSearch.java b/mobile/android/base/home/BrowserSearch.java index c2b0b4a0864..18aab5bf94e 100644 --- a/mobile/android/base/home/BrowserSearch.java +++ b/mobile/android/base/home/BrowserSearch.java @@ -772,7 +772,6 @@ public class BrowserSearch extends HomeFragment super(context); mSuggestClient = suggestClient; mSearchTerm = searchTerm; - mSuggestions = null; } @Override diff --git a/mobile/android/base/home/HomeConfig.java b/mobile/android/base/home/HomeConfig.java index 14f48a0a031..06319717ab4 100644 --- a/mobile/android/base/home/HomeConfig.java +++ b/mobile/android/base/home/HomeConfig.java @@ -1072,9 +1072,7 @@ public final class HomeConfig { mConfigMap = new HashMap(); mConfigOrder = new LinkedList(); mEventQueue = new LinkedList(); - mEnabledCount = 0; - mHasChanged = false; mIsFromDefault = configState.isDefault(); initFromState(configState); diff --git a/mobile/android/base/home/SuggestClient.java b/mobile/android/base/home/SuggestClient.java index 158d982aa1a..7b3d41bd165 100644 --- a/mobile/android/base/home/SuggestClient.java +++ b/mobile/android/base/home/SuggestClient.java @@ -60,7 +60,6 @@ public class SuggestClient { @RobocopTarget public SuggestClient(Context context, String suggestTemplate, int timeout) { this(context, suggestTemplate, timeout, Integer.MAX_VALUE); - mCheckNetwork = false; } /** diff --git a/mobile/android/base/home/TopSitesGridView.java b/mobile/android/base/home/TopSitesGridView.java index 94e8503f8d6..da21a34f9c7 100644 --- a/mobile/android/base/home/TopSitesGridView.java +++ b/mobile/android/base/home/TopSitesGridView.java @@ -90,8 +90,6 @@ public class TopSitesGridView extends GridView { mHorizontalSpacing = a.getDimensionPixelOffset(R.styleable.TopSitesGridView_android_horizontalSpacing, 0x00); mVerticalSpacing = a.getDimensionPixelOffset(R.styleable.TopSitesGridView_android_verticalSpacing, 0x00); a.recycle(); - - mIsHandlingFocusChange = false; } /** diff --git a/mobile/android/base/home/TopSitesPanel.java b/mobile/android/base/home/TopSitesPanel.java index e52deeba47d..991db07b152 100644 --- a/mobile/android/base/home/TopSitesPanel.java +++ b/mobile/android/base/home/TopSitesPanel.java @@ -110,10 +110,6 @@ public class TopSitesPanel extends HomeFragment { return new TopSitesPanel(); } - public TopSitesPanel() { - mUrlOpenListener = null; - } - private static boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG); private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE); diff --git a/mobile/android/base/menu/GeckoMenu.java b/mobile/android/base/menu/GeckoMenu.java index 48f77842091..70ecbbe513a 100644 --- a/mobile/android/base/menu/GeckoMenu.java +++ b/mobile/android/base/menu/GeckoMenu.java @@ -133,7 +133,6 @@ public class GeckoMenu extends ListView setAdapter(mAdapter); setOnItemClickListener(this); - mShowIcons = false; mItems = new ArrayList(); mPrimaryActionItems = new HashMap(); mSecondaryActionItems = new HashMap(); diff --git a/mobile/android/base/mozglue/NativeZip.java b/mobile/android/base/mozglue/NativeZip.java index 74a3a03d304..84e8ac64378 100644 --- a/mobile/android/base/mozglue/NativeZip.java +++ b/mobile/android/base/mozglue/NativeZip.java @@ -21,7 +21,6 @@ public class NativeZip implements NativeReference { public NativeZip(String path) { mObj = getZip(path); - mInput = null; } public NativeZip(InputStream input) { diff --git a/mobile/android/base/tabspanel/TabsPanel.java b/mobile/android/base/tabspanel/TabsPanel.java index 5dfa5615d19..0ae396632d9 100644 --- a/mobile/android/base/tabspanel/TabsPanel.java +++ b/mobile/android/base/tabspanel/TabsPanel.java @@ -100,10 +100,6 @@ public class TabsPanel extends LinearLayout setOrientation(LinearLayout.VERTICAL); mCurrentPanel = Panel.NORMAL_TABS; - mVisible = false; - mHeaderVisible = false; - - mIsSideBar = false; mPopupMenu = new GeckoPopupMenu(context); mPopupMenu.inflate(R.menu.tabs_menu); diff --git a/mobile/android/base/tabspanel/TabsTray.java b/mobile/android/base/tabspanel/TabsTray.java index 42d07a65e29..57736a178e2 100644 --- a/mobile/android/base/tabspanel/TabsTray.java +++ b/mobile/android/base/tabspanel/TabsTray.java @@ -510,8 +510,6 @@ class TabsTray extends TwoWayView private boolean mEnabled; public TabSwipeGestureListener() { - mSwipeView = null; - mSwiping = false; mEnabled = true; ViewConfiguration vc = ViewConfiguration.get(TabsTray.this.getContext()); diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java index aec3031d8a3..1337daa0c80 100644 --- a/mobile/android/base/toolbar/BrowserToolbar.java +++ b/mobile/android/base/toolbar/BrowserToolbar.java @@ -182,7 +182,6 @@ public class BrowserToolbar extends ThemedRelativeLayout Tabs.registerOnTabsChangedListener(this); isSwitchingTabs = true; - isAnimatingEntry = false; EventDispatcher.getInstance().registerGeckoThreadListener(this, "Reader:Click", @@ -198,8 +197,7 @@ public class BrowserToolbar extends ThemedRelativeLayout urlBarEntryDefaultLayoutParams = (RelativeLayout.LayoutParams) urlBarEntry.getLayoutParams(); // API level 19 adds a RelativeLayout.LayoutParams copy constructor, so we explicitly cast // to ViewGroup.MarginLayoutParams to ensure consistency across platforms. - urlBarEntryShrunkenLayoutParams = new RelativeLayout.LayoutParams( - (ViewGroup.MarginLayoutParams) urlBarEntryDefaultLayoutParams); + urlBarEntryShrunkenLayoutParams = new RelativeLayout.LayoutParams(urlBarEntryDefaultLayoutParams); // Note: a shrunken phone layout is not displayed on any known devices, // and thus shrunken layout params for phone are not maintained. if (HardwareUtils.isTablet()) { @@ -488,7 +486,7 @@ public class BrowserToolbar extends ThemedRelativeLayout @Override public boolean onTouchEvent(MotionEvent event) { - // If the motion event has occured below the toolbar (due to the scroll + // If the motion event has occurred below the toolbar (due to the scroll // offset), let it pass through to the page. if (event != null && event.getY() > getHeight() + ViewHelper.getTranslationY(this)) { return false; diff --git a/mobile/android/base/toolbar/ToolbarTitlePrefs.java b/mobile/android/base/toolbar/ToolbarTitlePrefs.java index e209a082f04..5426a4801a9 100644 --- a/mobile/android/base/toolbar/ToolbarTitlePrefs.java +++ b/mobile/android/base/toolbar/ToolbarTitlePrefs.java @@ -29,7 +29,6 @@ class ToolbarTitlePrefs { private Integer mPrefObserverId; ToolbarTitlePrefs() { - mShowUrl = false; mTrimUrls = true; mPrefObserverId = PrefsHelper.getPrefs(prefs, new TitlePrefsHandler()); diff --git a/mobile/android/base/widget/TabRow.java b/mobile/android/base/widget/TabRow.java index ae3325d80a8..67ae98e94f3 100644 --- a/mobile/android/base/widget/TabRow.java +++ b/mobile/android/base/widget/TabRow.java @@ -19,7 +19,6 @@ public class TabRow extends LinearLayout public TabRow(Context context, AttributeSet attrs) { super(context, attrs); - mChecked = false; } @Override