Bug 1268414 - Remove UnusedResourcesUtil.TEMPORARY_UNUSED_WHILE_MIGRATING_GRADLE and related resources. r?
authorSebastian Kaspari <s.kaspari@gmail.com>
Thu, 17 Nov 2016 15:45:31 +0800
changeset 323975 77bcbb91d542fd53db6f5d3683af5442cf279971
parent 323974 a214a23b603eb5dedf8210ae9d027b985fb60835
child 323976 f6bafacee6583f5e671cfeeb13717bd692a3311c
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
bugs1268414
milestone53.0a1
Bug 1268414 - Remove UnusedResourcesUtil.TEMPORARY_UNUSED_WHILE_MIGRATING_GRADLE and related resources. r? MozReview-Commit-ID: 2VMQrRvvMi3
mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
mobile/android/base/resources/values-land/styles.xml
mobile/android/base/resources/values-large-land-v11/styles.xml
mobile/android/base/resources/values-v13/styles.xml
mobile/android/base/resources/values-xlarge-v11/styles.xml
mobile/android/base/resources/values/styles.xml
--- a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
+++ b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
@@ -89,40 +89,14 @@ final class UnusedResourcesUtil {
             R.xml.preferences_advanced,
             R.xml.preferences_accessibility,
             R.xml.preferences_home,
             R.xml.preferences_privacy,
             R.xml.preferences_privacy_clear_tablet,
             R.xml.preferences_default_browser_tablet
     };
 
-    // We are migrating to Gradle 2.10 and the Android Gradle plugin 2.0. The new plugin does find
-    // more unused resources but we are not ready to remove them yet. Some of the resources are going
-    // to be reused soon. This is a temporary solution so that the gradle migration is not blocked.
-    // See bug 1263390 / bug 1268414.
-    public static final int[] TEMPORARY_UNUSED_WHILE_MIGRATING_GRADLE = {
-            R.color.remote_tabs_setup_button_background_hit,
-
-            R.drawable.remote_tabs_setup_button_background,
-
-            R.style.TabsPanelSectionBase,
-            R.style.TabsPanelSection,
-            R.style.TabsPanelItemBase,
-            R.style.TabsPanelItem,
-            R.style.TabsPanelItem_TextAppearance,
-            R.style.TabsPanelItem_TextAppearance_Header,
-            R.style.TabsPanelItem_TextAppearance_Linkified,
-            R.style.TabWidget,
-            R.style.GeckoDialogTitle,
-            R.style.GeckoDialogTitle_SubTitle,
-            R.style.RemoteTabsPanelItem,
-            R.style.RemoteTabsPanelItem_TextAppearance,
-            R.style.RemoteTabsPanelItem_TextAppearance_Header,
-            R.style.RemoteTabsPanelItem_TextAppearance_Linkified,
-            R.style.RemoteTabsPanelItem_Button,
-    };
-
     // String resources that are used in the full-pane Activity Stream that are temporarily
     // not needed while Activity Stream is part of the HomePager
     public static final int[] TEMPORARY_UNUSED_ACTIVITY_STREAM = {
             R.string.activity_stream_topsites
     };
 }
--- a/mobile/android/base/resources/values-land/styles.xml
+++ b/mobile/android/base/resources/values-land/styles.xml
@@ -13,20 +13,9 @@
     <style name="TabsItem">
          <item name="android:nextFocusDown">@+id/close</item>
     </style>
 
     <style name="TabsItemClose">
          <item name="android:nextFocusUp">@+id/info</item>
     </style>
 
-    <!-- Tabs panel -->
-    <style name="TabsPanelSection" parent="TabsPanelSectionBase">
-        <item name="android:layout_weight">1</item>
-    </style>
-
-    <style name="TabsPanelItem">
-        <item name="android:layout_marginBottom">20dp</item>
-        <item name="android:layout_gravity">left</item>
-        <item name="android:gravity">left</item>
-    </style>
-
 </resources>
--- a/mobile/android/base/resources/values-large-land-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-land-v11/styles.xml
@@ -16,19 +16,9 @@
     <style name="Widget.TopSitesGridView" parent="Widget.GridView">
         <item name="android:paddingLeft">55dp</item>
         <item name="android:paddingRight">55dp</item>
         <item name="android:paddingBottom">30dp</item>
         <item name="android:horizontalSpacing">20dp</item>
         <item name="android:verticalSpacing">20dp</item>
     </style>
 
-    <!-- Tabs panel -->
-    <style name="TabsPanelSection" parent="TabsPanelSectionBase">
-        <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
-    </style>
-
-    <style name="TabsPanelItem" parent="TabsPanelItemBase">
-        <!-- To override the values-land style. -->
-    </style>
-
 </resources>
--- a/mobile/android/base/resources/values-v13/styles.xml
+++ b/mobile/android/base/resources/values-v13/styles.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="GeckoDialogTitle">
-        <!-- Override this to use a Holo theme on v13+ -->
-        <item name="android:textAppearance">@android:style/TextAppearance.Holo.DialogWindowTitle</item>
-    </style>
-
     <style name="TextAppearance.Widget.ActionBar.Title" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
 
 </resources>
--- a/mobile/android/base/resources/values-xlarge-v11/styles.xml
+++ b/mobile/android/base/resources/values-xlarge-v11/styles.xml
@@ -5,22 +5,16 @@
 
 <resources>
 
     <!--
         Only overriden styles for Honeycomb/Ice cream sandwich XLARGE tablets are specified here.
         Please refer to values/styles.xml for default styles.
     -->
 
-    <!-- TabWidget -->
-    <style name="TabWidget">
-        <item name="android:layout_width">300dip</item>
-        <item name="android:layout_height">48dip</item>
-    </style>
-
     <style name="Widget.TopSitesListView" parent="Widget.BookmarksListView">
         <item name="android:paddingTop">30dp</item>
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingRight">32dp</item>
         <item name="android:clipToPadding">false</item>
         <item name="topDivider">false</item>
     </style>
 
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -488,54 +488,16 @@
     <style name="TabsItem">
          <item name="android:nextFocusRight">@+id/close</item>
     </style>
 
     <style name="TabsItemClose">
          <item name="android:nextFocusLeft">@+id/info</item>
     </style>
 
-    <!-- Tabs panel -->
-    <style name="TabsPanelSectionBase">
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_marginLeft">40dp</item>
-        <item name="android:layout_marginRight">40dp</item>
-    </style>
-
-    <style name="TabsPanelSection" parent="TabsPanelSectionBase">
-        <!-- We set values in landscape. -->
-    </style>
-
-    <style name="TabsPanelItemBase">
-        <item name="android:layout_marginBottom">28dp</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="TabsPanelItem" parent="TabsPanelItemBase">
-        <!-- We set values in landscape. -->
-    </style>
-
-    <style name="TabsPanelItem.TextAppearance">
-        <item name="android:textColor">#C0C9D0</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:lineSpacingMultiplier">1.35</item>
-    </style>
-
-    <style name="TabsPanelItem.TextAppearance.Header">
-        <item name="android:textSize">18sp</item>
-        <item name="android:layout_marginBottom">16dp</item>
-    </style>
-
-    <style name="TabsPanelItem.TextAppearance.Linkified">
-        <item name="android:clickable">true</item>
-        <item name="android:focusable">true</item>
-        <item name="android:textColor">#0292D6</item>
-    </style>
-
     <style name="Widget.RemoteTabsItemView" parent="Widget.TwoLinePageRow"/>
 
     <style name="Widget.RemoteTabsClientView" parent="Widget.TwoLinePageRow">
         <item name="android:background">@color/about_page_header_grey</item>
     </style>
 
     <style name="Widget.RemoteTabsListView" parent="Widget.HomeListView">
         <item name="android:childDivider">@color/toolbar_divider_grey</item>
@@ -553,23 +515,16 @@
         <item name="android:ellipsize">middle</item>
     </style>
 
     <!-- TabsLayout RemoteTabs Row Url -->
     <style name="TabLayoutItemTextAppearance.Url">
         <item name="android:textColor">#FFA4A7A9</item>
     </style>
 
-    <!-- TabWidget --> 
-    <style name="TabWidget">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">40dip</item>
-        <item name="android:layout_weight">1.0</item>
-    </style>
-
     <!-- Find bar -->
     <style name="FindBar">
         <item name="android:background">@color/text_and_tabs_tray_grey</item>
         <item name="android:paddingLeft">3dip</item>
         <item name="android:paddingRight">3dip</item>
         <item name="android:paddingTop">6dip</item>
         <item name="android:paddingBottom">6dip</item>
     </style>
@@ -580,22 +535,16 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginLeft">5dip</item>
         <item name="android:layout_marginRight">5dip</item>
         <item name="android:scaleType">fitCenter</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:background">@drawable/action_bar_button_inverse</item>
     </style>
 
-    <style name="GeckoDialogTitle">
-        <item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
-    </style>
-
-    <style name="GeckoDialogTitle.SubTitle" />
-
     <style name="PopupAnimation">
         <item name="@android:windowEnterAnimation">@anim/popup_show</item>
         <item name="@android:windowExitAnimation">@anim/popup_hide</item>
     </style>
 
     <style name="ToastBase">
         <item name="android:background">@drawable/toast_background</item>
         <item name="android:layout_width">match_parent</item>