Bug 876712 - (Part 3) Remove more unused awesomebar_* files, and rename awesomebar_suggestion_row.xml. r=sriram
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Wed, 12 Jun 2013 13:54:31 -0700
changeset 143329 d9df2bdc40bbc59dea582215fd778a12a1153db9
parent 143328 00ef1efa58bf4f776d50454c659226cdf06ca5db
child 143330 7956d9860adc01fc20f797f9ebb20e52c027a8e6
push id25130
push userlrocha@mozilla.com
push dateWed, 21 Aug 2013 09:41:27 +0000
treeherdermozilla-central@b2486721572e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssriram
bugs876712
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 876712 - (Part 3) Remove more unused awesomebar_* files, and rename awesomebar_suggestion_row.xml. r=sriram
mobile/android/base/Makefile.in
mobile/android/base/SearchEngineRow.java
mobile/android/base/resources/anim/awesomebar_fade_in.xml
mobile/android/base/resources/anim/awesomebar_fade_out.xml
mobile/android/base/resources/anim/awesomebar_hold_still.xml
mobile/android/base/resources/drawable/awesomebar_listview_divider.xml
mobile/android/base/resources/layout/awesomebar_actionbar.xml
mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
mobile/android/base/resources/layout/search_engine_row.xml
mobile/android/base/resources/layout/suggestion_item.xml
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -422,17 +422,16 @@ ifdef MOZ_ANDROID_SHARED_ACCOUNT_TYPE
 DEFINES += -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE)"
 endif
 
 RES_LAYOUT = \
   $(SYNC_RES_LAYOUT) \
   res/layout/abouthome_content.xml \
   res/layout/autocomplete_list.xml \
   res/layout/autocomplete_list_item.xml \
-  res/layout/awesomebar_suggestion_item.xml \
   res/layout/bookmark_edit.xml \
   res/layout/bookmark_folder_row.xml \
   res/layout/browser_toolbar.xml \
   res/layout/datetime_picker.xml \
   res/layout/doorhangerpopup.xml \
   res/layout/doorhanger.xml \
   res/layout/doorhanger_button.xml \
   res/layout/find_in_page_content.xml \
@@ -464,16 +463,17 @@ RES_LAYOUT = \
   res/layout/tabs_item_row.xml \
   res/layout/text_selection_handles.xml \
   res/layout/two_line_page_row.xml \
   res/layout/list_item_header.xml \
   res/layout/select_dialog_list.xml \
   res/layout/select_dialog_multichoice.xml \
   res/layout/select_dialog_singlechoice.xml \
   res/layout/simple_dropdown_item_1line.xml \
+  res/layout/suggestion_item.xml \
   res/layout/abouthome_addon_row.xml \
   res/layout/abouthome_last_tabs_row.xml \
   res/layout/abouthome_section.xml \
   res/layout/abouthome_remote_tab_row.xml \
   res/layout/abouthome_topsite_item.xml \
   res/layout/validation_message.xml \
   res/layout/videoplayer.xml \
   $(NULL)
--- a/mobile/android/base/SearchEngineRow.java
+++ b/mobile/android/base/SearchEngineRow.java
@@ -144,17 +144,17 @@ class SearchEngineRow extends AnimatedHe
         for (int i = 0; i < suggestionCount; i++) {
             final View suggestionItem;
 
             // Reuse suggestion views from recycled view, if possible
             if (i + 1 < recycledSuggestionCount) {
                 suggestionItem = mSuggestionView.getChildAt(i + 1);
                 suggestionItem.setVisibility(View.VISIBLE);
             } else {
-                suggestionItem = mInflater.inflate(R.layout.awesomebar_suggestion_item, null);
+                suggestionItem = mInflater.inflate(R.layout.suggestion_item, null);
 
                 suggestionItem.setOnClickListener(mClickListener);
                 suggestionItem.setOnLongClickListener(mLongClickListener);
 
                 final ImageView magnifier =
                         (ImageView) suggestionItem.findViewById(R.id.suggestion_magnifier);
                 magnifier.setVisibility(View.GONE);
 
deleted file mode 100644
--- a/mobile/android/base/resources/anim/awesomebar_fade_in.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <alpha android:interpolator="@android:anim/accelerate_interpolator"
-           android:fromAlpha="0.0"
-           android:toAlpha="1.0"
-           android:duration="100"/>
-
-</set>
deleted file mode 100644
--- a/mobile/android/base/resources/anim/awesomebar_fade_out.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <alpha android:interpolator="@android:anim/accelerate_interpolator"
-           android:fromAlpha="1.0"
-           android:toAlpha="0.0"
-           android:duration="200"/>
-
-</set>
deleted file mode 100644
--- a/mobile/android/base/resources/anim/awesomebar_hold_still.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <alpha android:interpolator="@android:anim/accelerate_interpolator"
-           android:duration="100"/>
-
-</set>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/awesomebar_listview_divider.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/. -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="#D1D5DA"/>
-    <size android:height="1dp"/>
-</shape>
deleted file mode 100644
--- a/mobile/android/base/resources/layout/awesomebar_actionbar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/UrlBar"/>
--- a/mobile/android/base/resources/layout/search_engine_row.xml
+++ b/mobile/android/base/resources/layout/search_engine_row.xml
@@ -14,14 +14,14 @@
 	                   android:minWidth="@dimen/favicon_bg"
 	                   android:minHeight="@dimen/favicon_bg"/>
 
 	<org.mozilla.gecko.FlowLayout android:id="@+id/suggestion_layout"
 	                              android:layout_toRightOf="@id/suggestion_icon"
 	                              android:layout_width="wrap_content"
 	                              android:layout_height="wrap_content">
 
-	    <include layout="@layout/awesomebar_suggestion_item"
+	    <include layout="@layout/suggestion_item"
 	             android:id="@+id/suggestion_user_entered"/>
 
 	</org.mozilla.gecko.FlowLayout>
 
 </merge>
\ No newline at end of file
rename from mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
rename to mobile/android/base/resources/layout/suggestion_item.xml