Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a473ff27 authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Fix blocked numbers rotation jank." into ub-contactsdialer-a-dev

parents 2960a7bf 6d13e7f7
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:paddingTop="?android:attr/actionBarSize"
    android:background="@color/blocked_number_background">

    <ListView android:id="@id/android:list"
+2 −1
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/blocked_numbers_activity_container"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:layout_marginTop="@dimen/action_bar_height">
</FrameLayout>
+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:paddingTop="?android:attr/actionBarSize"
    android:background="@color/blocked_number_background">

    <ListView android:id="@id/android:list"
+1 −3
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ public class BlockedNumbersFragment extends ListFragment
        ColorDrawable backgroundDrawable =
                new ColorDrawable(getActivity().getColor(R.color.dialer_theme_color));
        actionBar.setBackgroundDrawable(backgroundDrawable);
        actionBar.setElevation(getResources().getDimensionPixelSize(R.dimen.action_bar_elevation));
        actionBar.setDisplayShowCustomEnabled(false);
        actionBar.setDisplayHomeAsUpEnabled(true);
        actionBar.setDisplayShowHomeEnabled(true);
@@ -138,8 +137,7 @@ public class BlockedNumbersFragment extends ListFragment
    @Override
    public View onCreateView(
            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.blocked_number_fragment, container, false);
        return view;
        return inflater.inflate(R.layout.blocked_number_fragment, container, false);
    }

    @Override
+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class ManageBlockedNumbersActivity extends AppCompatActivity

    @Override
    public boolean isActionBarShowing() {
        return true;
        return false;
    }

    @Override
@@ -135,11 +135,11 @@ public class ManageBlockedNumbersActivity extends AppCompatActivity

    @Override
    public int getActionBarHideOffset() {
        return getSupportActionBar().getHideOffset();
        return 0;
    }

    @Override
    public int getActionBarHeight() {
        return getSupportActionBar().getHeight();
        return 0;
    }
}
Loading