- Fix for FP-75
diff --git a/res/layout/favourite_access_widget.xml b/res/layout/favourite_access_widget.xml
index c8fdefe..2b55678 100644
--- a/res/layout/favourite_access_widget.xml
+++ b/res/layout/favourite_access_widget.xml
@@ -4,43 +4,6 @@
android:layout_height="match_parent"
android:orientation="vertical" >
- <RelativeLayout
- android:id="@+id/header"
- android:layout_width="match_parent"
- android:layout_height="66dp" >
-
- <ImageButton
- android:id="@+id/buttonLauncher"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:background="#00ffffff"
- android:src="@drawable/people_widget_all_contacts_button_icon" />
-
- <Button
- android:id="@+id/buttonReset"
- style="@style/PeopleWidgetButtonReset"
- android:layout_width="wrap_content"
- android:layout_height="36dp"
- android:layout_alignParentRight="true"
- android:layout_marginRight="6.6dp"
- android:layout_marginTop="13.5dp"
- android:text="@string/reset"
- android:visibility="gone" />
-
- <Button
- android:id="@+id/buttonResetDisabled"
- style="@style/PeopleWidgetButtonReset"
- android:layout_width="wrap_content"
- android:layout_height="36dp"
- android:layout_alignParentRight="true"
- android:layout_marginRight="6.6dp"
- android:layout_marginTop="13.5dp"
- android:enabled="false"
- android:text="@string/reset"
- android:visibility="gone" />
- </RelativeLayout>
-
<TextView
android:id="@+id/most_contacted_label"
style="@style/SubTitle"
@@ -77,14 +40,51 @@
<LinearLayout
android:id="@+id/last_contacted_row_1"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="80dp"
android:orientation="horizontal" />
<LinearLayout
android:id="@+id/last_contacted_row_2"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="80dp"
android:orientation="horizontal"
android:visibility="gone" />
+
+ <RelativeLayout
+ android:id="@+id/header"
+ android:layout_width="match_parent"
+ android:layout_height="66dp" >
+
+ <ImageButton
+ android:id="@+id/buttonLauncher"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:background="#00ffffff"
+ android:src="@drawable/people_widget_all_contacts_button_icon" />
+
+ <!-- <Button
+ android:id="@+id/buttonReset"
+ style="@style/PeopleWidgetButtonReset"
+ android:layout_width="wrap_content"
+ android:layout_height="36dp"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="6.6dp"
+ android:layout_marginTop="13.5dp"
+ android:text="@string/reset"
+ android:visibility="gone" />
+
+ <Button
+ android:id="@+id/buttonResetDisabled"
+ style="@style/PeopleWidgetButtonReset"
+ android:layout_width="wrap_content"
+ android:layout_height="36dp"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="6.6dp"
+ android:layout_marginTop="13.5dp"
+ android:enabled="false"
+ android:text="@string/reset"
+ android:visibility="gone" /> -->
+ </RelativeLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/src/com/kwamecorp/peoplewidget/widget/PeopleWidget.java b/src/com/kwamecorp/peoplewidget/widget/PeopleWidget.java
index 594bed2..7534fd3 100644
--- a/src/com/kwamecorp/peoplewidget/widget/PeopleWidget.java
+++ b/src/com/kwamecorp/peoplewidget/widget/PeopleWidget.java
@@ -325,16 +325,16 @@
private void toggleResetButtonVisibility(RemoteViews widget, List<ContactInfo> lastContacted, List<ContactInfo> mostContacted)
{
- if (lastContacted.size() == 0 && mostContacted.size() == 0)
- {
- widget.setViewVisibility(R.id.buttonReset, View.GONE);
- widget.setViewVisibility(R.id.buttonResetDisabled, View.VISIBLE);
- }
- else
- {
- widget.setViewVisibility(R.id.buttonReset, View.VISIBLE);
- widget.setViewVisibility(R.id.buttonResetDisabled, View.GONE);
- }
+ // if (lastContacted.size() == 0 && mostContacted.size() == 0)
+ // {
+ // widget.setViewVisibility(R.id.buttonReset, View.GONE);
+ // widget.setViewVisibility(R.id.buttonResetDisabled, View.VISIBLE);
+ // }
+ // else
+ // {
+ // widget.setViewVisibility(R.id.buttonReset, View.VISIBLE);
+ // widget.setViewVisibility(R.id.buttonResetDisabled, View.GONE);
+ // }
}
private int setupButtonClickIntents(Context context, int code, RemoteViews widget)
@@ -347,10 +347,12 @@
widget.setOnClickPendingIntent(R.id.buttonLauncher, launchPendingIntent);
// set up the reset apps intent
- Intent resetIntent = new Intent();
- resetIntent.setAction(CommunicationMonitorService.PEOPLE_WIDGET_RESET);
- PendingIntent resetPendingIntent = PendingIntent.getBroadcast(context, code++, resetIntent, PendingIntent.FLAG_UPDATE_CURRENT);
- widget.setOnClickPendingIntent(R.id.buttonReset, resetPendingIntent);
+ // Intent resetIntent = new Intent();
+ // resetIntent.setAction(CommunicationMonitorService.PEOPLE_WIDGET_RESET);
+ // PendingIntent resetPendingIntent =
+ // PendingIntent.getBroadcast(context, code++, resetIntent,
+ // PendingIntent.FLAG_UPDATE_CURRENT);
+ // widget.setOnClickPendingIntent(R.id.buttonReset, resetPendingIntent);
return code;
}
}