summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/main
diff options
context:
space:
mode:
authoryueg <yueg@google.com>2018-06-28 14:26:45 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-28 16:25:46 -0700
commit5b99e36d5139a4e6b141af45f4cbcd946d81675e (patch)
treec883e3adc2497dcb8efeae8a7f5dc0524ba967e6 /java/com/android/dialer/main
parent9af4b65fa7717a647e3c8996cbbbcc93637aeab4 (diff)
Fix scroll for new favorites
Test: SpeedDialAdapterTest PiperOrigin-RevId: 202543795 Change-Id: I1eec7a7328da3037b4d1cbacc7d9b211305e3eb0
Diffstat (limited to 'java/com/android/dialer/main')
-rw-r--r--java/com/android/dialer/main/impl/OldMainActivityPeer.java29
-rw-r--r--java/com/android/dialer/main/impl/res/layout/main_activity.xml14
2 files changed, 30 insertions, 13 deletions
diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
index d790c6814..73bb4f81a 100644
--- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
@@ -51,6 +51,7 @@ import android.text.method.LinkMovementMethod;
import android.view.ActionMode;
import android.view.DragEvent;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
@@ -334,7 +335,12 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
activity.findViewById(R.id.remove_view),
activity.findViewById(R.id.search_view_container),
toolbar);
- speedDialFragmentHost = new MainSpeedDialFragmentHost(toolbar);
+ speedDialFragmentHost =
+ new MainSpeedDialFragmentHost(
+ toolbar,
+ activity.findViewById(R.id.root_layout),
+ activity.findViewById(R.id.coordinator_layout),
+ activity.findViewById(R.id.fragment_container));
lastTabController = new LastTabController(activity, bottomNav, showVoicemailTab);
@@ -1255,15 +1261,32 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
private static final class MainSpeedDialFragmentHost implements SpeedDialFragment.HostInterface {
private final MainToolbar toolbar;
-
- MainSpeedDialFragmentHost(MainToolbar toolbar) {
+ private final ViewGroup rootLayout;
+ private final ViewGroup coordinatorLayout;
+ private final ViewGroup fragmentContainer;
+
+ MainSpeedDialFragmentHost(
+ MainToolbar toolbar,
+ ViewGroup rootLayout,
+ ViewGroup coordinatorLayout,
+ ViewGroup fragmentContainer) {
this.toolbar = toolbar;
+ this.rootLayout = rootLayout;
+ this.coordinatorLayout = coordinatorLayout;
+ this.fragmentContainer = fragmentContainer;
}
@Override
public void setHasFrequents(boolean hasFrequents) {
toolbar.showClearFrequents(hasFrequents);
}
+
+ @Override
+ public void dragFavorite(boolean start) {
+ rootLayout.setClipChildren(!start);
+ coordinatorLayout.setClipChildren(!start);
+ fragmentContainer.setClipChildren(!start);
+ }
}
/**
diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
index 76d709c16..5fd9bed7b 100644
--- a/java/com/android/dialer/main/impl/res/layout/main_activity.xml
+++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
@@ -19,9 +19,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false"
- android:clipToPadding="false">
+ android:layout_height="match_parent">
<!-- MainToolbar -->
<include
@@ -35,17 +33,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar"
- android:layout_above="@+id/bottom_nav_bar"
- android:clipChildren="false"
- android:clipToPadding="false">
+ android:layout_above="@+id/bottom_nav_bar">
<!-- Holds SpeedDial, Call Log, Contacts, Voicemail and Search fragments -->
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false"
- android:clipToPadding="false"/>
+ android:layout_height="match_parent"/>
<FrameLayout
android:id="@+id/search_fragment_container"
@@ -102,4 +96,4 @@
android:importantForAccessibility="no"
android:visibility="gone"/>
</FrameLayout>
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>