Commit 02059bbd authored by Sriram Ramasubramanian's avatar Sriram Ramasubramanian
Browse files

Bug 708266: UI to show tabs remote tabs. [r=mfinkle, r=rnewman] 

--HG--
rename : mobile/android/base/resources/drawable/background.png => mobile/android/base/resources/drawable-nodpi/background.png
parent 2484a780

mobile/android/base/AboutHomeContent.java

+0 −14
Original line number Diff line number Diff line
@@ -717,18 +717,4 @@ public class AboutHomeContent extends ScrollView { 
            return false;

        }

    }



    public static class LinkTextView extends TextView {

        public LinkTextView(Context context, AttributeSet attrs) {

            super(context, attrs);

        }



        @Override

        public void setText(CharSequence text, BufferType type) {

            SpannableString content = new SpannableString(text + " \u00BB");

            content.setSpan(new UnderlineSpan(), 0, text.length(), 0);



            super.setText(content, BufferType.SPANNABLE);

        }

    }

}

mobile/android/base/AndroidManifest.xml.in

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ 
                  android:theme="@style/Gecko.Translucent.TabsTray"

                  android:launchMode="singleTask"/>



        <activity android:name="org.mozilla.gecko.RemoteTabs"

                  android:theme="@style/Gecko.Translucent.TabsTray"

                  android:launchMode="singleTask"/>



        <activity android:name="org.mozilla.gecko.GeckoPreferences"

                  android:theme="@style/Gecko.TitleBar.Preferences"

                  android:label="@string/settings_title"

mobile/android/base/GeckoApp.java

+0 −1
Original line number Diff line number Diff line
@@ -850,7 +850,6 @@ abstract public class GeckoApp 


    void showTabs() {

        Intent intent = new Intent(mAppContext, TabsTray.class);

        intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);

        startActivity(intent);

        overridePendingTransition(R.anim.grow_fade_in, 0);

    }

mobile/android/base/LinkTextView.java

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* 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/. */



package org.mozilla.gecko;



import android.content.Context;

import android.util.AttributeSet;

import android.text.SpannableString;

import android.text.style.UnderlineSpan;

import android.widget.TextView;



public class LinkTextView extends TextView {

    public LinkTextView(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    @Override

    public void setText(CharSequence text, BufferType type) {

        SpannableString content = new SpannableString(text + " \u00BB");

        content.setSpan(new UnderlineSpan(), 0, text.length(), 0);



        super.setText(content, BufferType.SPANNABLE);

    }

}

mobile/android/base/Makefile.in

+7 −1
Original line number Diff line number Diff line
@@ -94,12 +94,14 @@ FENNEC_JAVA_FILES = \ 
  GeckoThread.java \

  GlobalHistory.java \

  LinkPreference.java \

  LinkTextView.java \

  ProfileMigrator.java \

  PromptService.java \

  sqlite/ByteBufferInputStream.java \

  sqlite/MatrixBlobCursor.java \

  sqlite/SQLiteBridge.java \

  sqlite/SQLiteBridgeException.java \

  RemoteTabs.java \

  SetupScreen.java \

  SurfaceLockInfo.java \

  Tab.java \
@@ -245,6 +247,9 @@ RES_LAYOUT = \ 
  res/layout/notification_progress_text.xml \

  res/layout/site_setting_title.xml \

  res/layout/setup_screen.xml \

  res/layout/remote_tabs.xml \

  res/layout/remote_tabs_child.xml \

  res/layout/remote_tabs_group.xml \

  res/layout/tabs_row.xml \

  res/layout/tabs_tray.xml \

  res/layout/list_item_header.xml \
@@ -290,6 +295,7 @@ RES_ANIM = \ 
RES_DRAWABLE_NODPI = \

  res/drawable-nodpi/abouthome_bg.png \

  res/drawable-nodpi/abouthome_topsites_bg.png \

  res/drawable-nodpi/background.png \

  res/drawable-nodpi/tabs_tray_bg.png \

  res/drawable-nodpi/tabs_tray_pressed_bg.png \

  $(NULL)
@@ -525,7 +531,6 @@ MOZ_ANDROID_DRAWABLES += \ 
  mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml      \

  mobile/android/base/resources/drawable/awesomebar_tab_selected.xml            \

  mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml          \

  mobile/android/base/resources/drawable/background.png                         \

  mobile/android/base/resources/drawable/desktop_notification.png               \

  mobile/android/base/resources/drawable/gecko_actionbar_bg.xml                 \

  mobile/android/base/resources/drawable/progress_spinner.xml                   \
@@ -547,6 +552,7 @@ MOZ_ANDROID_DRAWABLES += \ 
  mobile/android/base/resources/drawable/progress_spinner_16.png                \

  mobile/android/base/resources/drawable/progress_spinner_17.png                \

  mobile/android/base/resources/drawable/progress_spinner_18.png                \

  mobile/android/base/resources/drawable/remote_tabs_group_bg_repeat.xml        \

  mobile/android/base/resources/drawable/start.png                              \

  mobile/android/base/resources/drawable/site_security_level.xml                \

  mobile/android/base/resources/drawable/tabs_button.xml                        \