diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-03-20 20:40:36 +0000 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-03-20 20:40:36 +0000 |
| commit | 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 (patch) | |
| tree | 2f55365aaf87df9ba7c1fe0be56a7d0988eadf30 /java/com/android/incallui/incall/impl/res | |
| parent | 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd (diff) | |
| download | android_packages_apps_Dialer-30ccc4f3aa6da94f0bb8a01a880a6353b883b263.tar.gz android_packages_apps_Dialer-30ccc4f3aa6da94f0bb8a01a880a6353b883b263.tar.bz2 android_packages_apps_Dialer-30ccc4f3aa6da94f0bb8a01a880a6353b883b263.zip | |
Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237"
This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.
Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6
Diffstat (limited to 'java/com/android/incallui/incall/impl/res')
3 files changed, 11 insertions, 17 deletions
diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml index e4bc942bb..9b950462c 100644 --- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml +++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml @@ -60,21 +60,23 @@ android:layout_height="match_parent"/> </LinearLayout> - <com.android.incallui.incall.impl.LockableViewPager + <android.support.v4.view.ViewPager android:id="@+id/incall_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@+id/incall_paginator" + android:layout_above="@+id/incall_tab_dots" android:layout_below="@+id/incall_contact_grid" android:layout_centerHorizontal="true"/> - <com.android.incallui.incall.impl.InCallPaginator - android:id="@+id/incall_paginator" - android:layout_height="@dimen/paginator_height" - android:layout_width="@dimen/paginator_width" - android:layout_above="@+id/incall_end_call" - android:layout_centerHorizontal="true" - android:visibility="gone"/> + <android.support.design.widget.TabLayout + android:id="@+id/incall_tab_dots" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/incall_end_call" + android:visibility="gone" + app:tabBackground="@drawable/tab_selector" + app:tabGravity="center" + app:tabIndicatorHeight="0dp"/> <FrameLayout android:id="@+id/incall_dialpad_container" diff --git a/java/com/android/incallui/incall/impl/res/values/dimens.xml b/java/com/android/incallui/incall/impl/res/values/dimens.xml index 72602e3fc..249788785 100644 --- a/java/com/android/incallui/incall/impl/res/values/dimens.xml +++ b/java/com/android/incallui/incall/impl/res/values/dimens.xml @@ -14,9 +14,4 @@ <bool name="incall_dialpad_allowed">false</bool> <integer name="incall_num_rows">0</integer> - - <dimen name="paginator_dot_radius">5dp</dimen> - <dimen name="paginator_dots_separation">8dp</dimen> - <dimen name="paginator_height">38dp</dimen> - <dimen name="paginator_width">72dp</dimen> </resources> diff --git a/java/com/android/incallui/incall/impl/res/values/styles.xml b/java/com/android/incallui/incall/impl/res/values/styles.xml index a8cf2ddf1..2392574a3 100644 --- a/java/com/android/incallui/incall/impl/res/values/styles.xml +++ b/java/com/android/incallui/incall/impl/res/values/styles.xml @@ -17,9 +17,6 @@ <resources> - <color name="paginator_dot">#FFF</color> - <color name="paginator_path">#66FFFFFF</color> - <style name="DialpadContainer"> <item name="android:layout_alignParentTop">true</item> </style> |