diff options
| author | Rahul <rahul731999@gmail.com> | 2022-05-01 21:38:32 +0300 |
|---|---|---|
| committer | Semavi Ulusoy <doc.divxm@gmail.com> | 2022-09-13 10:46:26 +0300 |
| commit | 881bbfdcd64a2a8f41bb0f047968063c2827d0dc (patch) | |
| tree | ed149ac181198b769935e21a37f336b48a85b5e6 | |
| parent | 87b67f0b2aaa7ff98a4d9ef825d1ba450b07a7c1 (diff) | |
Dialer: Add & Import google dialer's bottomnavbar icons
Change-Id: I80efc7ac56331a1286c8e988ea42bee05994c56c
16 files changed, 130 insertions, 4 deletions
diff --git a/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java b/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java index 798f01edf..684f542a0 100644 --- a/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java +++ b/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java @@ -69,9 +69,10 @@ public final class BottomNavBar extends LinearLayout { contacts = findViewById(R.id.contacts_tab); voicemail = findViewById(R.id.voicemail_tab); - speedDial.setup(R.string.tab_title_speed_dial, R.drawable.quantum_ic_star_vd_theme_24); - callLog.setup(R.string.tab_title_call_history, R.drawable.quantum_ic_access_time_vd_theme_24); - contacts.setup(R.string.tab_all_contacts, R.drawable.quantum_ic_people_vd_theme_24); + + speedDial.setup(R.string.tab_title_speed_dial, R.drawable.bottom_nav_ic_speed_dial_vd_theme_24); + callLog.setup(R.string.tab_title_call_history, R.drawable.bottom_nav_ic_call_history_vd_theme_24); + contacts.setup(R.string.tab_all_contacts, R.drawable.bottom_nav_ic_contacts_vd_theme_24); voicemail.setup(R.string.tab_title_voicemail, R.drawable.quantum_ic_voicemail_vd_theme_24); speedDial.setOnClickListener( diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_call_history_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_call_history_vd_theme_24.xml new file mode 100644 index 000000000..2dfdb98c8 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_call_history_vd_theme_24.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/quantum_ic_watch_later_vd_theme_24" android:state_selected="true" /> + <item android:drawable="@drawable/quantum_gm_ic_access_time_vd_theme_24" /> +</selector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_contacts_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_contacts_vd_theme_24.xml new file mode 100644 index 000000000..b49f14ed5 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_contacts_vd_theme_24.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/quantum_gm_ic_people_alt_vd_theme_24" android:state_selected="true" /> + <item android:drawable="@drawable/quantum_gm_ic_people_vd_theme_24" /> +</selector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_speed_dial_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_speed_dial_vd_theme_24.xml new file mode 100644 index 000000000..c287c7057 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/bottom_nav_ic_speed_dial_vd_theme_24.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/quantum_gm_ic_star_vd_theme_24" android:state_selected="true" /> + <item android:drawable="@drawable/quantum_gm_ic_star_outline_vd_theme_24" /> +</selector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_favorites_normal.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_favorites_normal.xml new file mode 100644 index 000000000..bf6e1673b --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_favorites_normal.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="?android:attr/textColorPrimary" + android:pathData="M19.0001,22.8484L11.9001,19.1484L5.0001,22.7484L6.3001,14.9484V14.8484L0.6001,9.4484L8.4001,8.3484L12.0001,1.1484L15.5001,8.2484L23.4001,9.4484L17.7001,14.9484V15.0484L19.0001,22.8484ZM11.9001,17.3484C12.2001,17.3484 12.5001,17.4484 12.8001,17.5484L16.6001,19.5484L15.9001,15.3484C15.8001,14.7484 16.0001,14.1484 16.5001,13.6484L19.5001,10.6484L15.3001,10.0484C14.7001,9.9484 14.1001,9.5484 13.9001,9.0484L12.0001,5.1484L10.1001,8.9484C9.8001,9.5484 9.3001,9.8484 8.7001,9.9484L4.5001,10.5484L7.5001,13.5484C7.9001,13.9484 8.2001,14.6484 8.0001,15.2484L7.3001,19.4484L11.0001,17.4484C11.3001,17.3484 11.6001,17.3484 11.9001,17.3484Z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_people_normal.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_people_normal.xml new file mode 100644 index 000000000..537884f86 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_people_normal.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="21.0dp" + android:height="21.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="?android:attr/textColorPrimary" + android:pathData="M4,4.25C3.862,4.25 3.75,4.362 3.75,4.5L3.75,20.5C3.75,20.638 3.862,20.75 4,20.75L20,20.75C20.138,20.75 20.25,20.638 20.25,20.5L20.25,4.5C20.25,4.362 20.138,4.25 20,4.25L4,4.25ZM4,2.75L20,2.75C20.966,2.75 21.75,3.534 21.75,4.5L21.75,20.5C21.75,21.466 20.966,22.25 20,22.25L4,22.25C3.034,22.25 2.25,21.466 2.25,20.5L2.25,4.5C2.25,3.534 3.034,2.75 4,2.75ZM17.75,18.5L16.25,18.5L16.252,17.332C16.19,16.449 15.531,15.724 14.6,15.568C13.767,15.362 12.913,15.256 12.06,15.25L11.945,15.25C11.087,15.256 10.233,15.363 9.342,15.58C8.467,15.725 7.807,16.454 7.75,17.29L7.75,18.5L6.25,18.5L6.252,17.241C6.355,15.66 7.534,14.359 9.041,14.112C9.988,13.878 10.959,13.757 11.94,13.75L12.065,13.75C13.041,13.756 14.013,13.878 14.902,14.1C16.461,14.358 17.639,15.652 17.75,17.28L17.75,18.5ZM10.25,10.97L10.25,12.03C10.25,12.98 11.02,13.75 11.97,13.75L12.03,13.75C12.98,13.75 13.75,12.98 13.75,12.03L13.75,10.97C13.75,10.02 12.98,9.25 12.03,9.25L11.97,9.25C11.02,9.25 10.25,10.02 10.25,10.97ZM12.03,7.75C13.808,7.75 15.25,9.192 15.25,10.97L15.25,12.03C15.25,13.808 13.808,15.25 12.03,15.25L11.97,15.25C10.192,15.25 8.75,13.808 8.75,12.03L8.75,10.97C8.75,9.192 10.192,7.75 11.97,7.75L12.03,7.75ZM6.25,1.5L7.75,1.5L7.75,5.5L6.25,5.5L6.25,1.5ZM11.25,1.5L12.75,1.5L12.75,5.5L11.25,5.5L11.25,1.5ZM16.25,1.5L17.75,1.5L17.75,5.5L16.25,5.5L16.25,1.5Z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_schedule_normal.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_schedule_normal.xml new file mode 100644 index 000000000..1b349362c --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/oneplus_tab_strip_ic_schedule_normal.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="21.0dp" + android:height="21.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="?android:attr/textColorPrimary" + android:pathData="M12,22.75A10.75,10.75 0,1 1,22.75 12,10.762 10.762,0 0,1 12,22.75ZM12,2.75A9.25,9.25 0,1 0,21.25 12,9.26 9.26,0 0,0 12,2.75ZM15.874,14.813L12.75,11.689L12.75,7h-1.5v5.311l3.563,3.563Z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_access_time_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_access_time_vd_theme_24.xml new file mode 100644 index 000000000..cfd5f6e14 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_access_time_vd_theme_24.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM16.49,16.36L11,13.07L11,6.42h2v5.51l4.51,2.71z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_people_alt_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_people_alt_vd_theme_24.xml new file mode 100644 index 000000000..af13a85eb --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_people_alt_vd_theme_24.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M16.67,13.13C18.04,14.06 19,15.32 19,17v3h4v-3c0,-2.18 -3.57,-3.47 -6.33,-3.87z" /> + <path + android:fillColor="@android:color/white" + android:pathData="M9,8m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" /> + <path + android:fillColor="@android:color/white" + android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4c-0.47,0 -0.91,0.1 -1.33,0.24C14.5,5.27 15,6.58 15,8s-0.5,2.73 -1.33,3.76c0.42,0.14 0.86,0.24 1.33,0.24zM9,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_people_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_people_vd_theme_24.xml new file mode 100644 index 000000000..5e5c8b969 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_people_vd_theme_24.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M15,8c0,-1.42 -0.5,-2.73 -1.33,-3.76 0.42,-0.14 0.86,-0.24 1.33,-0.24 2.21,0 4,1.79 4,4s-1.79,4 -4,4c-0.43,0 -0.84,-0.09 -1.23,-0.21 -0.03,-0.01 -0.06,-0.02 -0.1,-0.03C14.5,10.73 15,9.42 15,8zM16.66,13.13C18.03,14.06 19,15.32 19,17v3h4v-3c0,-2.18 -3.58,-3.47 -6.34,-3.87zM9,6c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2m0,9c-2.7,0 -5.8,1.29 -6,2.01L3,18h12v-1c-0.2,-0.71 -3.3,-2 -6,-2M9,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4 -4,-1.79 -4,-4 1.79,-4 4,-4zM9,13c2.67,0 8,1.34 8,4v3L1,20v-3c0,-2.66 5.33,-4 8,-4z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_star_outline_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_star_outline_vd_theme_24.xml new file mode 100644 index 000000000..10f0cff62 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_star_outline_vd_theme_24.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_star_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_star_vd_theme_24.xml new file mode 100644 index 000000000..3565372c7 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_gm_ic_star_vd_theme_24.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_ic_watch_later_vd_theme_24.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_ic_watch_later_vd_theme_24.xml new file mode 100644 index 000000000..ad5f9c0f2 --- /dev/null +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/quantum_ic_watch_later_vd_theme_24.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13L11,7h1.5v5.2l4.5,2.7 -0.8,1.3z" /> +</vector> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml index 00f38c777..2a552d164 100644 --- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml +++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="80dp" - android:minHeight="56dp" + android:minHeight="80dp" android:gravity="center" android:background="?android:attr/selectableItemBackgroundBorderless"> diff --git a/java/com/android/dialer/main/impl/res/drawable/bg.xml b/java/com/android/dialer/main/impl/res/drawable/bg.xml new file mode 100644 index 000000000..c02ba2e48 --- /dev/null +++ b/java/com/android/dialer/main/impl/res/drawable/bg.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="?android:attr/colorControlNormal" /> + <corners android:radius="14dp" /> +</shape> diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index e23f77817..91acccbdb 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -151,6 +151,8 @@ public class InCallFragment extends Fragment } } + private View view; + @Nullable @Override @SuppressLint("MissingPermission") |
