Merge "Add overscroll effect to all lists" (0a0460c1) · Commits · e / os / android_packages_apps_Contacts

res/layout/contact_list_filter_custom.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,8 @@
		android:layout_height="0dip"
		android:layout_weight="1"
		android:layout_marginLeft="@dimen/contact_filter_left_margin"
		android:layout_marginRight="@dimen/contact_filter_right_margin" />
		android:layout_marginRight="@dimen/contact_filter_right_margin"
		android:overScrollMode="always" />

		<View
		android:layout_width="match_parent"

res/values-sw580dp-w720dp/styles.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		<item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
		<item name="android:textColorPrimary">@color/primary_text_color</item>
		<item name="android:textColorSecondary">@color/secondary_text_color</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		<item name="list_item_height">66dip</item>
		<item name="activated_background">@drawable/list_item_activated_background</item>
		<item name="section_header_background">@drawable/list_title_holo</item>

res/values-sw580dp/styles.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		<item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
		<item name="android:textColorPrimary">@color/primary_text_color</item>
		<item name="android:textColorSecondary">@color/secondary_text_color</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
		<item name="activated_background">@drawable/list_item_activated_background</item>
		<item name="section_header_background">@drawable/list_title_holo</item>
		@@ -56,6 +57,7 @@
		</style>

		<style name="ContactPickerTheme" parent="@android:Theme.Holo.Light.Dialog">
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
		<item name="section_header_background">@drawable/list_title_holo</item>
		<item name="list_item_divider">?android:attr/listDivider</item>
		@@ -95,6 +97,7 @@

		<style name="ContactListFilterTheme" parent="@android:Theme.Holo.Light.Dialog">
		<item name="android:windowCloseOnTouchOutside">true</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		</style>

		<style name="CustomContactListFilterView" parent="ContactListFilterTheme">

res/values/styles.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		<item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
		<item name="android:windowContentOverlay">@null</item>
		<item name="android:windowBackground">@drawable/background_dial_holo_dark</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		<item name="activated_background">@drawable/list_item_activated_background</item>
		<item name="section_header_background">@drawable/list_title_holo</item>
		<item name="list_section_header_height">32dip</item>
		@@ -68,6 +69,7 @@
		<style name="CallDetailActivityTheme" parent="android:Theme.Holo">
		<item name="android:windowBackground">@android:color/black</item>
		<item name="android:gravity">top</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		<!-- CallLog -->
		<item name="call_log_primary_text_color">#FFFFFF</item>
		<item name="call_log_primary_background_color">#000000</item>
		@@ -87,6 +89,7 @@
		<item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>
		<item name="android:textColorPrimary">@color/primary_text_color</item>
		<item name="android:textColorSecondary">@color/secondary_text_color</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		</style>

		<style name="EditorActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
		@@ -96,6 +99,7 @@
		<item name="android:windowContentOverlay">@null</item>
		<item name="android:textColorPrimary">@color/primary_text_color</item>
		<item name="android:textColorSecondary">@color/secondary_text_color</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		</style>

		<style name="BackgroundOnlyTheme" parent="@android:style/Theme.Holo.Light">
		@@ -120,6 +124,7 @@
		<item name="android:backgroundDimEnabled">true</item>
		<item name="android:windowIsTranslucent">true</item>
		<item name="android:windowNoTitle">true</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		</style>

		<style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
		@@ -129,6 +134,7 @@
		<item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
		<item name="android:textColorPrimary">@color/primary_text_color</item>
		<item name="android:textColorSecondary">@color/secondary_text_color</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
		<item name="activated_background">@drawable/list_item_activated_background</item>
		<item name="section_header_background">@drawable/list_title_holo</item>
		@@ -186,6 +192,10 @@
		<item name="android:listSelector">?android:attr/listChoiceBackgroundIndicator</item>
		</style>

		<style name="ListViewStyle" parent="@android:style/Widget.Holo.Light.ListView">
		<item name="android:overScrollMode">always</item>
		</style>

		<style name="ContactPickerTheme" parent="@style/PeopleTheme" />

		<style name="ContactPickerLayout" parent="ContactPickerTheme">
		@@ -197,9 +207,11 @@
		</style>

		<style name="ContactsPreferencesTheme" parent="@android:Theme.Holo.Light">
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		</style>

		<style name="ContactListFilterTheme" parent="@android:Theme.Holo.Light">
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		</style>

		<style name="CustomContactListFilterView" parent="ContactListFilterTheme">
		@@ -225,6 +237,7 @@
		<item name="android:windowCloseOnTouchOutside">true</item>
		<item name="android:textColorPrimary">@color/primary_text_color</item>
		<item name="android:textColorSecondary">@color/secondary_text_color</item>
		<item name="android:listViewStyle">@style/ListViewStyle</item>
		</style>

		<style name="SectionDivider">

src/com/android/contacts/editor/GroupMembershipView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ public class GroupMembershipView extends LinearLayout

		ListView listView = mPopup.getListView();
		listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
		listView.setOverScrollMode(OVER_SCROLL_ALWAYS);
		int count = mAdapter.getCount();
		for (int i = 0; i < count; i++) {
		listView.setItemChecked(i, mAdapter.getItem(i).isChecked());