diff options
author | Sai Cheemalapati <saicheems@google.com> | 2014-06-02 09:41:03 -0700 |
---|---|---|
committer | Sai Cheemalapati <saicheems@google.com> | 2014-06-02 11:39:42 -0700 |
commit | 1e61380222440bb53a46a05907914207ce282386 (patch) | |
tree | 33dd4ee274d40a0f9618fe5431b2f8a5f7126b54 /src | |
parent | a250b2df516961224e0844d4953e4faf1868b8cd (diff) |
Matching landscape dialer to mockups.
Dialer now matches mockup in landscape mode.
Bug: 15386162
Change-Id: I8abb7a6c13bbeb1cb9210532e850010b196fe14e
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 14 | ||||
-rw-r--r-- | src/com/android/dialer/list/SearchFragment.java | 12 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index df2a87c8a..e516a534f 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -330,8 +330,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O final Resources resources = getResources(); mActionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height); - mFloatingActionButtonMarginBottom = - resources.getDimensionPixelOffset(R.dimen.floating_action_button_margin_bottom); + mFloatingActionButtonMarginBottom = resources.getDimensionPixelOffset( + R.dimen.floating_action_button_margin_bottom); mFloatingActionButtonDialpadMarginBottom = resources.getDimensionPixelOffset( R.dimen.floating_action_button_dialpad_margin_bottom); @@ -662,7 +662,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } private void updateSearchFragmentPosition() { - int translationValue = mIsDialpadShown ? -mActionBarHeight : 0; + int startTranslationValue = mIsDialpadShown ? mActionBarHeight : 0; + int endTranslationValue = mIsDialpadShown ? 0 : mActionBarHeight; SearchFragment fragment = null; if (mSmartDialSearchFragment != null && mSmartDialSearchFragment.isVisible()) { fragment = mSmartDialSearchFragment; @@ -670,8 +671,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O fragment = mRegularSearchFragment; } if (fragment != null && fragment.isVisible()) { - fragment.getView().animate().translationY(translationValue) - .setInterpolator(hideActionBarInterpolator).setDuration(ANIMATION_DURATION); + fragment.getListView().setTranslationY(startTranslationValue); + fragment.getListView().animate().translationY(endTranslationValue) + .setInterpolator(hideActionBarInterpolator) + .setDuration(ANIMATION_DURATION) + .start(); } } diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index 9a30c4de6..f309f72ea 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -80,14 +80,8 @@ public class SearchFragment extends PhoneNumberPickerFragment { mActionBarHeight = activity.getActionBarHeight(); final View parentView = getView(); - parentView.setPaddingRelative( - parentView.getPaddingStart(), - mActionBarHeight, - parentView.getPaddingEnd(), - parentView.getPaddingBottom()); final ListView listView = getListView(); - listView.setOnScrollListener(new OnScrollListener() { @Override public void onScrollStateChanged(AbsListView view, int scrollState) { @@ -99,10 +93,8 @@ public class SearchFragment extends PhoneNumberPickerFragment { int totalItemCount) { } }); - - - if (!activity.isActionBarShowing()) { - parentView.setTranslationY(-mActionBarHeight); + if (activity.isActionBarShowing()) { + listView.setTranslationY(mActionBarHeight); } } |