Merge change 25462 into eclair

* changes:
  UI Refuresh of account folder list
This commit is contained in:
Android (Google) Code Review 2009-09-17 22:35:29 -04:00
commit 925be3bf76
5 changed files with 12 additions and 5 deletions

View File

@ -25,7 +25,7 @@
android:id="@+id/chip" android:id="@+id/chip"
android:background="@drawable/appointment_indicator_leftside_1" android:background="@drawable/appointment_indicator_leftside_1"
android:layout_width="4dip" android:layout_width="4dip"
android:layout_height="56dip" android:layout_height="fill_parent"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<ImageView <ImageView
android:id="@+id/folder_icon" android:id="@+id/folder_icon"
@ -69,13 +69,17 @@
android:layout_marginLeft="4dip" android:layout_marginLeft="4dip"
style="@style/unreadCount"/> style="@style/unreadCount"/>
</LinearLayout> </LinearLayout>
<View
android:id="@+id/folder_separator"
android:background="@color/account_folder_list_item_background_read"
android:layout_width="0.5dip"
android:layout_height="40dip"
android:layout_marginLeft="5dip" />
<ImageView <ImageView
android:id="@+id/folder_button" android:id="@+id/folder_button"
android:layout_width="40dip" android:layout_width="40dip"
android:layout_height="40dip" android:layout_height="40dip"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginLeft="4dip"
android:layout_marginRight="4dip"
android:minWidth="30dip" android:minWidth="30dip"
android:paddingTop="5dip" android:paddingTop="5dip"
android:paddingLeft="5dip" android:paddingLeft="5dip"

View File

@ -26,7 +26,7 @@
android:id="@+id/chip" android:id="@+id/chip"
android:background="@drawable/appointment_indicator_leftside_1" android:background="@drawable/appointment_indicator_leftside_1"
android:layout_width="4dip" android:layout_width="4dip"
android:layout_height="56dip" android:layout_height="fill_parent"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<ImageView <ImageView
android:id="@+id/folder_icon" android:id="@+id/folder_icon"

View File

@ -23,7 +23,7 @@
android:id="@+id/chip" android:id="@+id/chip"
android:background="@drawable/appointment_indicator_leftside_1" android:background="@drawable/appointment_indicator_leftside_1"
android:layout_width="4dip" android:layout_width="4dip"
android:layout_height="56dip" android:layout_height="fill_parent"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<!-- TODO: Remove the top padding hack and align to the subject baseline --> <!-- TODO: Remove the top padding hack and align to the subject baseline -->
<ImageView <ImageView

View File

@ -18,4 +18,5 @@
<color name="folder_message_list_child_background">#3B3B3B</color> <color name="folder_message_list_child_background">#3B3B3B</color>
<color name="message_list_item_background_unread">#333333</color> <color name="message_list_item_background_unread">#333333</color>
<color name="message_list_item_background_read">#3B3B3B</color> <color name="message_list_item_background_read">#3B3B3B</color>
<color name="account_folder_list_item_background_read">#303030</color>
</resources> </resources>

View File

@ -753,6 +753,7 @@ public class AccountFolderList extends ListActivity
countView.setPadding(2, 0, 2, 0); countView.setPadding(2, 0, 2, 0);
view.findViewById(R.id.folder_button).setVisibility(View.GONE); view.findViewById(R.id.folder_button).setVisibility(View.GONE);
view.findViewById(R.id.folder_separator).setVisibility(View.GONE);
view.findViewById(R.id.folder_icon).setVisibility(View.VISIBLE); view.findViewById(R.id.folder_icon).setVisibility(View.VISIBLE);
((ImageView)view.findViewById(R.id.folder_icon)).setImageDrawable( ((ImageView)view.findViewById(R.id.folder_icon)).setImageDrawable(
Utility.FolderProperties.getInstance(context).getIconIds(type)); Utility.FolderProperties.getInstance(context).getIconIds(type));
@ -814,6 +815,7 @@ public class AccountFolderList extends ListActivity
view.findViewById(R.id.folder_icon).setVisibility(View.GONE); view.findViewById(R.id.folder_icon).setVisibility(View.GONE);
view.findViewById(R.id.folder_button).setVisibility(View.VISIBLE); view.findViewById(R.id.folder_button).setVisibility(View.VISIBLE);
view.findViewById(R.id.folder_separator).setVisibility(View.VISIBLE);
} }
@Override @Override