Bug 1306609 - Remove MORE link from activity stream panel. r?ahunt
MozReview-Commit-ID: 7TMGKX4pXrO
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -828,11 +828,8 @@ just addresses the organization to follo
<!ENTITY helper_first_offline_bookmark_button "Go to Bookmarks">
<!ENTITY helper_triple_readerview_open_title "Available offline">
<!ENTITY helper_triple_readerview_open_message "Bookmark Reader View items to read them offline.">
<!ENTITY helper_triple_readerview_open_button "Add to Bookmarks">
<!ENTITY activity_stream_topsites "Top Sites">
<!ENTITY activity_stream_highlights "Highlights">
-<!-- LOCALIZATION NOTE (activity_stream_more): Link that opens the detailed bookmark/history lists
- when pressed. -->
-<!ENTITY activity_stream_more "More">
--- a/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
+++ b/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
@@ -28,40 +28,23 @@
android:layout_alignParentEnd="true"/>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:padding="4dp"
android:background="@color/disabled_grey"
- android:layout_below="@+id/topsites_indicator"
- android:layout_alignRight="@+id/more_highlights"
- android:layout_alignEnd="@+id/more_highlights"/>
+ android:layout_below="@+id/topsites_indicator" />
<TextView
android:id="@+id/title_highlights"
android:padding="4dp"
android:text="@string/activity_stream_highlights"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textSize="14sp"
android:layout_below="@+id/divider"
android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_toLeftOf="@+id/more_highlights"
- android:layout_toStartOf="@+id/more_highlights"/>
-
- <TextView
- android:id="@+id/more_highlights"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="4dp"
- android:textAllCaps="true"
- android:textColor="@android:color/holo_orange_dark"
- android:textSize="14sp"
- android:text="@string/activity_stream_more"
- android:layout_below="@+id/divider"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"/>
+ android:layout_alignParentStart="true" />
</RelativeLayout>
\ No newline at end of file
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -627,10 +627,9 @@
<string name="helper_first_offline_bookmark_button">&helper_first_offline_bookmark_button;</string>
<string name="helper_triple_readerview_open_title">&helper_triple_readerview_open_title;</string>
<string name="helper_triple_readerview_open_message">&helper_triple_readerview_open_message;</string>
<string name="helper_triple_readerview_open_button">&helper_triple_readerview_open_button;</string>
<string name="activity_stream_topsites">&activity_stream_topsites;</string>
<string name="activity_stream_highlights">&activity_stream_highlights;</string>
- <string name="activity_stream_more">&activity_stream_more;</string>
</resources>