Bug 1060056 - Rename MainActivity to SearchActivity. r=margaret

--HG-- rename : mobile/android/search/java/org/mozilla/search/MainActivity.java => mobile/android/search/java/org/mozilla/search/SearchActivity.java
shellylin · Sep 26, 2014 · 3c87a4d · 3c87a4d
1 parent 90044df
commit 3c87a4d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
@@ -73,7 +73,7 @@ public class AppConstants {
      * The name of the Java class that launches the browser.
      */
     public static final String BROWSER_INTENT_CLASS_NAME = "org.mozilla.gecko.BrowserApp";
-    public static final String SEARCH_INTENT_CLASS_NAME = "org.mozilla.search.MainActivity";
+    public static final String SEARCH_INTENT_CLASS_NAME = "org.mozilla.search.SearchActivity";
 
     public static final String GRE_MILESTONE = "@GRE_MILESTONE@";
 

diff --git a/...java/org/mozilla/search/MainActivity.java → ...va/org/mozilla/search/SearchActivity.java b/...java/org/mozilla/search/MainActivity.java → ...va/org/mozilla/search/SearchActivity.java
@@ -34,7 +34,7 @@
  * State management is delegated to child fragments. Fragments communicate
  * with each other by passing messages through this activity.
  */
-public class MainActivity extends LocaleAware.LocaleAwareFragmentActivity
+public class SearchActivity extends LocaleAware.LocaleAwareFragmentActivity
         implements AcceptsSearchQuery, SearchEngineCallback {
 
     private static final String KEY_SEARCH_STATE = "search_state";
@@ -142,7 +142,7 @@ public void onFocusChange(boolean hasFocus) {
         settingsButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, SearchPreferenceActivity.class));
+                startActivity(new Intent(SearchActivity.this, SearchPreferenceActivity.class));
             }
         });
 

diff --git a/mobile/android/search/manifests/SearchAndroidManifest_activities.xml.in b/mobile/android/search/manifests/SearchAndroidManifest_activities.xml.in
@@ -1,5 +1,5 @@
         <activity
-            android:name="org.mozilla.search.MainActivity"
+            android:name="org.mozilla.search.SearchActivity"
             android:launchMode="singleTop"
             android:icon="@drawable/search_launcher"
             android:label="@string/search_app_name"
@@ -45,9 +45,9 @@
             android:name="org.mozilla.search.SearchPreferenceActivity"
             android:logo="@drawable/search_launcher"
             android:label="@string/search_pref_title"
-            android:parentActivityName="org.mozilla.search.MainActivity"
+            android:parentActivityName="org.mozilla.search.SearchActivity"
             android:theme="@style/SettingsTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.mozilla.search.MainActivity"/>
+                android:value="org.mozilla.search.SearchActivity"/>
         </activity>
diff --git a/mobile/android/search/res/layout/search_activity_main.xml b/mobile/android/search/res/layout/search_activity_main.xml
@@ -5,7 +5,7 @@
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".MainActivity">
+    tools:context=".SearchActivity">
 
     <org.mozilla.search.autocomplete.SearchBar
         android:id="@+id/search_bar"

diff --git a/mobile/android/search/search_activity_sources.mozbuild b/mobile/android/search/search_activity_sources.mozbuild
@@ -10,11 +10,11 @@ search_activity_sources = [
     'java/org/mozilla/search/autocomplete/SearchBar.java',
     'java/org/mozilla/search/autocomplete/SuggestionsFragment.java',
     'java/org/mozilla/search/Constants.java',
-    'java/org/mozilla/search/MainActivity.java',
     'java/org/mozilla/search/PostSearchFragment.java',
     'java/org/mozilla/search/PreSearchFragment.java',
     'java/org/mozilla/search/providers/SearchEngine.java',
     'java/org/mozilla/search/providers/SearchEngineManager.java',
+    'java/org/mozilla/search/SearchActivity.java',
     'java/org/mozilla/search/SearchPreferenceActivity.java',
     'java/org/mozilla/search/SearchWidget.java',
     'java/org/mozilla/search/ui/BackCaptureEditText.java',