mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 715274: Fix lists in AwesomeScreen. [r=mfinkle, r=margaret]

This commit is contained in:
Sriram Ramasubramanian 2012-03-26 14:39:24 -07:00
Родитель 2e35937273
Коммит efe4158f30
7 изменённых файлов: 60 добавлений и 51 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

56
mobile/android/base/AwesomeBarTabs.java
Просмотреть файл

@ -62,6 +62,7 @@ import android.widget.AdapterView;
import android.widget.ExpandableListView;
import android.widget.FilterQueryProvider;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.SimpleCursorAdapter;
import android.widget.SimpleExpandableListAdapter;
@ -205,7 +206,7 @@ public class AwesomeBarTabs extends TabHost {
private Resources mResources;
private LinkedList<Pair<Integer, String>> mParentStack;
private RefreshBookmarkCursorTask mRefreshTask = null;
private TextView mBookmarksTitleView;
private LinearLayout mBookmarksTitleView;
public BookmarksListAdapter(Context context, int layout, Cursor c, String[] from, int[] to) {
super(context, layout, c, from, to);
@ -307,7 +308,11 @@ public class AwesomeBarTabs extends TabHost {
return convertView;
}
public void setBookmarksTitleView(TextView titleView) {
public LinearLayout getBookmarksTitleView() {
return mBookmarksTitleView;
}
public void setBookmarksTitleView(LinearLayout titleView) {
mBookmarksTitleView = titleView;
}
@ -325,16 +330,23 @@ public class AwesomeBarTabs extends TabHost {
}
protected void onPostExecute(Cursor cursor) {
mRefreshTask = null;
mBookmarksAdapter.changeCursor(cursor);
ListView list = (ListView) findViewById(R.id.bookmarks_list);
list.setAdapter(null);
// Hide the header text if we're at the root folder
if (mFolderId == Bookmarks.FIXED_ROOT_ID) {
mBookmarksTitleView.setVisibility(View.GONE);
if (list.getHeaderViewsCount() == 1)
list.removeHeaderView(mBookmarksTitleView);
} else {
mBookmarksTitleView.setText(mFolderTitle);
mBookmarksTitleView.setVisibility(View.VISIBLE);
if (list.getHeaderViewsCount() == 0)
list.addHeaderView(mBookmarksTitleView, null, true);
((TextView) mBookmarksTitleView.findViewById(R.id.title)).setText(mFolderTitle);
}
mBookmarksAdapter.changeCursor(cursor);
list.setAdapter(mBookmarksAdapter);
mRefreshTask = null;
}
}
}
@ -373,21 +385,15 @@ public class AwesomeBarTabs extends TabHost {
ListView bookmarksList = (ListView) findViewById(R.id.bookmarks_list);
bookmarksList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
handleBookmarkItemClick(position);
handleBookmarkItemClick(parent, view, position, id);
}
});
// We need to add the header before we set the adapter
LayoutInflater inflater =
(LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View headerView = inflater.inflate(R.layout.awesomebar_folder_header_row, null);
// Hide the header title view to begin with
TextView titleView = (TextView) headerView.findViewById(R.id.title);
titleView.setVisibility(View.GONE);
mBookmarksAdapter.setBookmarksTitleView(titleView);
bookmarksList.addHeaderView(headerView, null, true);
if (mBookmarksAdapter.getBookmarksTitleView() == null) {
// Caching the header view
LinearLayout headerView = (LinearLayout) LayoutInflater.from(mContext).inflate(R.layout.awesomebar_header_row, null);
mBookmarksAdapter.setBookmarksTitleView(headerView);
}
bookmarksList.setAdapter(mBookmarksAdapter);
@ -863,20 +869,24 @@ public class AwesomeBarTabs extends TabHost {
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
private void handleBookmarkItemClick(int position) {
private void handleBookmarkItemClick(AdapterView<?> parent, View view, int position, long id) {
int headerCount = ((ListView) parent).getHeaderViewsCount();
// If we tap on the header view, there's nothing to do
if (position == 0)
if (headerCount == 1 && position == 0)
return;
Cursor cursor = mBookmarksAdapter.getCursor();
// The header view takes up a spot in the list
cursor.moveToPosition(position - 1);
if (headerCount == 1)
position--;
cursor.moveToPosition(position);
int type = cursor.getInt(cursor.getColumnIndexOrThrow(Bookmarks.TYPE));
if (type == Bookmarks.TYPE_FOLDER) {
// If we're clicking on a folder, update mBookmarksAdapter to move to that folder
int folderId = cursor.getInt(cursor.getColumnIndexOrThrow(Bookmarks._ID));
String folderTitle = mBookmarksAdapter.getFolderTitle(position - 1);
String folderTitle = mBookmarksAdapter.getFolderTitle(position);
mBookmarksAdapter.moveToChildFolder(folderId, folderTitle);
return;

1
mobile/android/base/Makefile.in
Просмотреть файл

@ -252,7 +252,6 @@ RES_LAYOUT = \
res/layout/awesomebar.xml \
res/layout/awesomebar_actionbar.xml \
res/layout/awesomebar_folder_row.xml \
res/layout/awesomebar_folder_header_row.xml \
res/layout/awesomebar_header_row.xml \
res/layout/awesomebar_row.xml \
res/layout/awesomebar_search.xml \

18
mobile/android/base/resources/layout/awesomebar_folder_header_row.xml
Просмотреть файл

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?android:attr/listSeparatorTextViewStyle"
android:textColor="?android:attr/textColorPrimary"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
android:singleLine="true"
android:ellipsize="middle"/>
</LinearLayout>

31
mobile/android/base/resources/layout/awesomebar_header_row.xml
Просмотреть файл

@ -1,9 +1,22 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/listSeparatorTextViewStyle"
android:textColor="?android:attr/textColorPrimary"
android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:paddingLeft="5dip"/>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="2dp"
android:background="#E5E5E5">
<TextView android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:textColor="#222222"
android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
android:singleLine="true"
android:ellipsize="middle"/>
</LinearLayout>

1
mobile/android/base/resources/layout/awesomebar_tabs.xml
Просмотреть файл

@ -23,6 +23,7 @@
<ExpandableListView android:id="@+id/history_list"
style="@style/AwesomeBarList"
android:childDivider="#E5E5E5"
android:groupIndicator="@android:color/transparent"/>
</FrameLayout>

2
mobile/android/base/resources/values-v11/styles.xml
Просмотреть файл

@ -25,6 +25,8 @@
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:divider">#E5E5E5</item>
<item name="android:dividerHeight">1dp</item>
</style>
<!-- ActionBar -->

2
mobile/android/base/resources/values/styles.xml
Просмотреть файл

@ -67,6 +67,8 @@
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:divider">#E5E5E5</item>
<item name="android:dividerHeight">1dp</item>
</style>
<!-- Lists in TabsTray -->