diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-03-21 10:11:17 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-03-21 10:11:17 -0700 |
| commit | fc37b02f5d3381a7882770941e461b13b679b6ef (patch) | |
| tree | 23ce96100a89f1cf8847a4967efd35e56b6f8092 /java/com/android/incallui/incall/impl/res | |
| parent | 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 (diff) | |
| download | android_packages_apps_Dialer-fc37b02f5d3381a7882770941e461b13b679b6ef.tar.gz android_packages_apps_Dialer-fc37b02f5d3381a7882770941e461b13b679b6ef.tar.bz2 android_packages_apps_Dialer-fc37b02f5d3381a7882770941e461b13b679b6ef.zip | |
Update AOSP Dialer source from internal google3 repository at
cl/150756069
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150392808 (3/16/2017) to cl/150756069 (3/21/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I0888b5db52efb28eb8194600e0c7804592f975f3
Diffstat (limited to 'java/com/android/incallui/incall/impl/res')
3 files changed, 17 insertions, 11 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 9b950462c..e4bc942bb 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,23 +60,21 @@ android:layout_height="match_parent"/> </LinearLayout> - <android.support.v4.view.ViewPager + <com.android.incallui.incall.impl.LockableViewPager android:id="@+id/incall_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@+id/incall_tab_dots" + android:layout_above="@+id/incall_paginator" android:layout_below="@+id/incall_contact_grid" android:layout_centerHorizontal="true"/> - <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"/> + <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"/> <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 249788785..72602e3fc 100644 --- a/java/com/android/incallui/incall/impl/res/values/dimens.xml +++ b/java/com/android/incallui/incall/impl/res/values/dimens.xml @@ -14,4 +14,9 @@ <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 2392574a3..a8cf2ddf1 100644 --- a/java/com/android/incallui/incall/impl/res/values/styles.xml +++ b/java/com/android/incallui/incall/impl/res/values/styles.xml @@ -17,6 +17,9 @@ <resources> + <color name="paginator_dot">#FFF</color> + <color name="paginator_path">#66FFFFFF</color> + <style name="DialpadContainer"> <item name="android:layout_alignParentTop">true</item> </style> |