summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-04-13 12:30:01 -0700
committerJohn Reck <jreck@google.com>2011-04-13 12:30:01 -0700
commit778bd2e3bafe338eaf38e790bf1cf97efff2c011 (patch)
tree1ff2f75e31389ea3fe3ca0e55db9c5557c8ba139
parent172160e56773c2093d384b94da1f18b15c8de664 (diff)
downloadpackages_apps_Browser-778bd2e3bafe338eaf38e790bf1cf97efff2c011.tar.gz
packages_apps_Browser-778bd2e3bafe338eaf38e790bf1cf97efff2c011.tar.bz2
packages_apps_Browser-778bd2e3bafe338eaf38e790bf1cf97efff2c011.zip
Marquee history titles and urls
Bug: 2762388 Change-Id: I2b10e9b9f845e1c9b29571b8ddd792702ca07832
-rw-r--r--res/layout/history_item.xml6
-rw-r--r--src/com/android/browser/BookmarkItem.java10
-rw-r--r--src/com/android/browser/BrowserHistoryPage.java1
3 files changed, 15 insertions, 2 deletions
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index 3b3dd7a10..f6076a029 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -42,7 +42,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:ellipsize="end"
+ android:ellipsize="marquee"
+ android:marqueeRepeatLimit="marquee_forever"
/>
<TextView android:id="@+id/url"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -50,7 +51,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:ellipsize="end"
+ android:ellipsize="marquee"
+ android:marqueeRepeatLimit="marquee_forever"
/>
</LinearLayout>
<CheckBox android:id="@+id/star"
diff --git a/src/com/android/browser/BookmarkItem.java b/src/com/android/browser/BookmarkItem.java
index 4e60073cf..8247c9116 100644
--- a/src/com/android/browser/BookmarkItem.java
+++ b/src/com/android/browser/BookmarkItem.java
@@ -63,6 +63,16 @@ class BookmarkItem extends LinearLayout {
item.mImageView.setImageDrawable(mImageView.getDrawable());
}
+ public void startMarquee() {
+ mTextView.setSelected(true);
+ mUrlText.setSelected(true);
+ }
+
+ public void stopMarquee() {
+ mTextView.setSelected(false);
+ mUrlText.setSelected(false);
+ }
+
/**
* Return the name assigned to this bookmark item.
*/
diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 50bed369b..264c46563 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -674,6 +674,7 @@ public class BrowserHistoryPage extends Fragment
item.getPaddingRight(),
item.getPaddingBottom());
item.setFaviconBackground(mFaviconBackground);
+ item.startMarquee();
} else {
item = (HistoryItem) convertView;
}