Merge branch 'lineage-20.0' of https://github.com/LineageOS/android_packages_apps_Dialer into leaf-2.0
Change-Id: If2177943f0003fa7dc22e7d554011c4172bb0c70
diff --git a/Android.mk b/Android.mk
index 66111a4..b58b72a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -133,7 +133,6 @@
libbackup \
libphonenumber \
volley \
- org.lineageos.lib.phone
LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-core-ui \
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_backspace_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_backspace_white_24.png
deleted file mode 100644
index 136e8b8..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_backspace_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_block_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_block_white_24.png
deleted file mode 100644
index 2ccc89d..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_block_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_call_made_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_call_made_white_24.png
deleted file mode 100644
index ea6a8ab..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_call_made_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_call_missed_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_call_missed_white_24.png
deleted file mode 100644
index f188eb9..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_call_missed_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_call_received_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_call_received_white_24.png
deleted file mode 100644
index ca2ae41..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_call_received_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
deleted file mode 100644
index fd3edbd..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_24.png
deleted file mode 100644
index 9037f94..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_hd_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_hd_white_24.png
deleted file mode 100644
index 35bf51a..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_hd_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_language_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_language_white_24.png
deleted file mode 100644
index b7c8248..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_language_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_more_vert_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_more_vert_white_24.png
deleted file mode 100644
index 58e092b..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_more_vert_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_24.png
deleted file mode 100644
index 4d2ea05..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_signal_wifi_4_bar_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_signal_wifi_4_bar_white_24.png
deleted file mode 100644
index 5a53192..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_signal_wifi_4_bar_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_backspace_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_backspace_white_24.png
deleted file mode 100644
index 48863dc..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_backspace_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_block_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_block_white_24.png
deleted file mode 100644
index ec1b33f..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_block_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_call_made_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_call_made_white_24.png
deleted file mode 100644
index 9b3cd43..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_call_made_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_call_missed_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_call_missed_white_24.png
deleted file mode 100644
index 42c360b..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_call_missed_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_call_received_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_call_received_white_24.png
deleted file mode 100644
index fbc1e86..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_call_received_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
deleted file mode 100644
index 3f1f3f8..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_24.png
deleted file mode 100644
index 6c405f9..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_hd_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_hd_white_24.png
deleted file mode 100644
index 30938fe..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_hd_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_language_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_language_white_24.png
deleted file mode 100644
index 0bc7dfd..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_language_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_more_vert_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_more_vert_white_24.png
deleted file mode 100644
index 5ec0116..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_more_vert_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_24.png
deleted file mode 100644
index 2272d47..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_signal_wifi_4_bar_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_signal_wifi_4_bar_white_24.png
deleted file mode 100644
index dd5a42f..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_signal_wifi_4_bar_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_backspace_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_backspace_white_24.png
deleted file mode 100644
index ec5412b..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_backspace_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_block_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_block_white_24.png
deleted file mode 100644
index 7aba97b..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_block_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_made_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_call_made_white_24.png
deleted file mode 100644
index 7fe6941..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_made_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_missed_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_call_missed_white_24.png
deleted file mode 100644
index dd64489..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_missed_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_received_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_call_received_white_24.png
deleted file mode 100644
index 807308d..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_received_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
deleted file mode 100644
index 59c2fae..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_24.png
deleted file mode 100644
index 0e89f6c..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_hd_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_hd_white_24.png
deleted file mode 100644
index 4c954d8..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_hd_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_language_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_language_white_24.png
deleted file mode 100644
index eeaab46..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_language_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_more_vert_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_more_vert_white_24.png
deleted file mode 100644
index 96e5d43..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_more_vert_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_24.png
deleted file mode 100644
index f49aed7..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_signal_wifi_4_bar_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_signal_wifi_4_bar_white_24.png
deleted file mode 100644
index 28b5afa..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_signal_wifi_4_bar_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_backspace_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_backspace_white_24.png
deleted file mode 100644
index f6a90ac..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_backspace_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_block_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_block_white_24.png
deleted file mode 100644
index fddfa54..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_block_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_made_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_made_white_24.png
deleted file mode 100644
index ae471c9..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_made_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_missed_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_missed_white_24.png
deleted file mode 100644
index 2374dc5..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_missed_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_received_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_received_white_24.png
deleted file mode 100644
index 5842111..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_received_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
deleted file mode 100644
index d5fd569..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_24.png
deleted file mode 100644
index 1750005..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_hd_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_hd_white_24.png
deleted file mode 100644
index dd08bbb..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_hd_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_language_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_language_white_24.png
deleted file mode 100644
index d4b5518..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_language_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_more_vert_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_more_vert_white_24.png
deleted file mode 100644
index 801ad89..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_more_vert_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_24.png
deleted file mode 100644
index 7192ad4..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_signal_wifi_4_bar_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_signal_wifi_4_bar_white_24.png
deleted file mode 100644
index f4105ec..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_signal_wifi_4_bar_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_backspace_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_backspace_white_24.png
deleted file mode 100644
index 88131b9..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_backspace_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_block_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_block_white_24.png
deleted file mode 100644
index 0378d1b..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_block_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_made_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_made_white_24.png
deleted file mode 100644
index 844ef86..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_made_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_missed_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_missed_white_24.png
deleted file mode 100644
index b1321a9..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_missed_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_received_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_received_white_24.png
deleted file mode 100644
index 417999c..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_received_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
deleted file mode 100644
index dac4e9c..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_24.png
deleted file mode 100644
index eb4307a..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_hd_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_hd_white_24.png
deleted file mode 100644
index 3f87b88..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_hd_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_language_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_language_white_24.png
deleted file mode 100644
index a576ac7..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_language_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_more_vert_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_more_vert_white_24.png
deleted file mode 100644
index 7a97f4c..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_more_vert_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_24.png
deleted file mode 100644
index 660ac65..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_signal_wifi_4_bar_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_signal_wifi_4_bar_white_24.png
deleted file mode 100644
index 58a4f9c..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_signal_wifi_4_bar_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable/quantum_ic_add_call_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_add_call_vd_theme_24.xml
index b7d3a09..f618394 100644
--- a/assets/quantum/res/drawable/quantum_ic_add_call_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_add_call_vd_theme_24.xml
@@ -19,7 +19,8 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM21,6h-3V3h-2v3h-3v2h3v3h2V8h3z"/>
-</vector>
\ No newline at end of file
+ <path android:fillColor="@android:color/white"
+ android:pathData="M20.9991 19.2333L21 15.9298C21 15.3084 20.5788 14.7682 19.9755 14.6176L16.9552 13.8619C16.4953 13.7464 16.0047 13.8853 15.6728 14.219L12.8719 16.9962C12.7139 16.9067 12.5577 16.8145 12.4032 16.7197C10.4063 15.4699 8.7193 13.8139 7.43547 11.8443C7.27895 11.5998 7.12911 11.3505 6.9862 11.0969L9.7332 8.32812C10.066 7.99444 10.204 7.50293 10.0894 7.04389L9.33459 4.0254C9.18398 3.42207 8.64377 3 8.0224 3H3.86487C3.43108 3 3.08568 3.31294 3 3.72148C3 3.84585 3.00336 3.97101 3.00999 4.09691C3.31911 13.3197 10.7647 20.7333 20 20.9924C20.0952 20.9974 20.1889 21 20.2812 21C20.6889 20.9134 21 20.5689 21 20.1351L20.9991 19.2333ZM19 18.9284C17.6054 18.7944 16.2648 18.4757 15.0029 17.997L16.8945 16L19 16.5347V18.9284ZM6.00305 8.99712C5.5243 7.73524 5.20558 6.39461 5.07166 5H7.46531L8.00001 7.10551L6.00305 8.99712Z" />
+ <path android:fillColor="@android:color/white"
+ android:pathData="M18 5.99995V2.99995H16V5.99995H13V7.99995H16V11H18V7.99995H21V5.99995H18Z" />
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_add_call_white.xml b/assets/quantum/res/drawable/quantum_ic_add_call_white.xml
new file mode 100644
index 0000000..4b246a6
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_add_call_white.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path android:fillColor="@android:color/white"
+ android:pathData="M20.9991 19.2333L21 15.9298C21 15.3084 20.5788 14.7682 19.9755 14.6176L16.9552 13.8619C16.4953 13.7464 16.0047 13.8853 15.6728 14.219L12.8719 16.9962C12.7139 16.9067 12.5577 16.8145 12.4032 16.7197C10.4063 15.4699 8.7193 13.8139 7.43547 11.8443C7.27895 11.5998 7.12911 11.3505 6.9862 11.0969L9.7332 8.32812C10.066 7.99444 10.204 7.50293 10.0894 7.04389L9.33459 4.0254C9.18398 3.42207 8.64377 3 8.0224 3H3.86487C3.43108 3 3.08568 3.31294 3 3.72148C3 3.84585 3.00336 3.97101 3.00999 4.09691C3.31911 13.3197 10.7647 20.7333 20 20.9924C20.0952 20.9974 20.1889 21 20.2812 21C20.6889 20.9134 21 20.5689 21 20.1351L20.9991 19.2333ZM19 18.9284C17.6054 18.7944 16.2648 18.4757 15.0029 17.997L16.8945 16L19 16.5347V18.9284ZM6.00305 8.99712C5.5243 7.73524 5.20558 6.39461 5.07166 5H7.46531L8.00001 7.10551L6.00305 8.99712Z" />
+ <path android:fillColor="@android:color/white"
+ android:pathData="M18 5.99995V2.99995H16V5.99995H13V7.99995H16V11H18V7.99995H21V5.99995H18Z" />
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_backspace_white_24.xml b/assets/quantum/res/drawable/quantum_ic_backspace_white_24.xml
new file mode 100644
index 0000000..72359b2
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_backspace_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M9,15.59L12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59 17.59,17 14,13.41 10.41,17 9,15.59zM21,6H8l-4.5,6L8,18h13V6m0,-2c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H8c-0.63,0 -1.22,-0.3 -1.6,-0.8L1,12l5.4,-7.2c0.38,-0.5 0.97,-0.8 1.6,-0.8h13z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_block_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_block_vd_theme_24.xml
index 139e06a..47a4b83 100644
--- a/assets/quantum/res/drawable/quantum_ic_block_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_block_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+ android:pathData="M 12,2 C 17.52,2 22,6.48 22,12 22,17.52 17.52,22 12,22 6.48,22 2,17.52 2,12 2,6.48 6.48,2 12,2 Z m 8,10 C 20,7.58 16.42,4 12,4 10.15,4 8.45,4.63 7.1,5.69 L 18.31,16.9 C 19.37,15.55 20,13.85 20,12 Z m -8,8 c 1.85,0 3.55,-0.63 4.9,-1.69 L 5.69,7.1 C 4.63,8.45 4,10.15 4,12 c 0,4.42 3.58,8 8,8 z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_block_white_24.xml b/assets/quantum/res/drawable/quantum_ic_block_white_24.xml
new file mode 100644
index 0000000..71d463c
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_block_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M 12,2 C 17.52,2 22,6.48 22,12 22,17.52 17.52,22 12,22 6.48,22 2,17.52 2,12 2,6.48 6.48,2 12,2 Z m 8,10 C 20,7.58 16.42,4 12,4 10.15,4 8.45,4.63 7.1,5.69 L 18.31,16.9 C 19.37,15.55 20,13.85 20,12 Z m -8,8 c 1.85,0 3.55,-0.63 4.9,-1.69 L 5.69,7.1 C 4.63,8.45 4,10.15 4,12 c 0,4.42 3.58,8 8,8 z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_call_made_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_made_vd_theme_24.xml
index 6069227..22a7043 100644
--- a/assets/quantum/res/drawable/quantum_ic_call_made_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_call_made_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M9,5v2h6.59L4,18.59 5.41,20 17,8.41V15h2V5z"/>
+ android:pathData="M9,5v2h6.59L4,18.59 5.41,20 17,8.41V15h2V5H9z"/>
</vector>
diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/assets/quantum/res/drawable/quantum_ic_call_made_white_24.xml
similarity index 60%
copy from java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
copy to assets/quantum/res/drawable/quantum_ic_call_made_white_24.xml
index 8d04c72..dc83d6b 100644
--- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
+++ b/assets/quantum/res/drawable/quantum_ic_call_made_white_24.xml
@@ -13,12 +13,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<resources>
- <!-- Essential theme colors -->
- <color name="dialer_theme_color">#5195EA</color>
- <color name="dialer_theme_color_20pct">#335195EA</color>
- <color name="dialer_secondary_color">#5195EA</color>
- <color name="dialer_ripple_color">#33ffffff</color>
- <color name="dialer_search_bar_color">@color/google_grey_900</color>
- <color name="settings_primary_dark">#2374CE</color>
-</resources>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M9,5v2h6.59L4,18.59 5.41,20 17,8.41V15h2V5H9z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml
index 660faf4..e720493 100644
--- a/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M17,20.41L18.41,19 15,15.59 13.59,17 17,20.41zM7.5,8H11v5.59L5.59,19 7,20.41l6,-6V8h3.5L12,3.5 7.5,8z"/>
+ android:pathData="M13.59,16.593l1.406,-1.407 3.408,3.408L16.997,20zM16.5,7.5L12,3 7.5,7.5l1.41,1.41L11,6.83v6.35l-5.41,5.41L7,20l6,-6V6.83l2.09,2.08z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_call_missed_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_missed_vd_theme_24.xml
index 657dbf5..3b6ccbc 100644
--- a/assets/quantum/res/drawable/quantum_ic_call_missed_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_call_missed_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M19.59,7L12,14.59 6.41,9H11V7H3v8h2v-4.59l7,7 9,-9z"/>
+ android:pathData="M19.59,7L12,14.59 6.41,9H11V7H3v8h2v-4.59l7,7 9,-9L19.59,7z"/>
</vector>
diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/assets/quantum/res/drawable/quantum_ic_call_missed_white_24.xml
similarity index 60%
copy from java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
copy to assets/quantum/res/drawable/quantum_ic_call_missed_white_24.xml
index 8d04c72..0d3f235 100644
--- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
+++ b/assets/quantum/res/drawable/quantum_ic_call_missed_white_24.xml
@@ -13,12 +13,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<resources>
- <!-- Essential theme colors -->
- <color name="dialer_theme_color">#5195EA</color>
- <color name="dialer_theme_color_20pct">#335195EA</color>
- <color name="dialer_secondary_color">#5195EA</color>
- <color name="dialer_ripple_color">#33ffffff</color>
- <color name="dialer_search_bar_color">@color/google_grey_900</color>
- <color name="settings_primary_dark">#2374CE</color>
-</resources>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19.59,7L12,14.59 6.41,9H11V7H3v8h2v-4.59l7,7 9,-9L19.59,7z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_call_received_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_received_vd_theme_24.xml
index a489532..19803cd 100644
--- a/assets/quantum/res/drawable/quantum_ic_call_received_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_call_received_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M20,5.41L18.59,4 7,15.59V9H5v10h10v-2H8.41z"/>
+ android:pathData="M15,19v-2H8.41L20,5.41 18.59,4 7,15.59V9H5v10h10z"/>
</vector>
diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/assets/quantum/res/drawable/quantum_ic_call_received_white_24.xml
similarity index 60%
copy from java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
copy to assets/quantum/res/drawable/quantum_ic_call_received_white_24.xml
index 8d04c72..d0b4fdf 100644
--- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
+++ b/assets/quantum/res/drawable/quantum_ic_call_received_white_24.xml
@@ -13,12 +13,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<resources>
- <!-- Essential theme colors -->
- <color name="dialer_theme_color">#5195EA</color>
- <color name="dialer_theme_color_20pct">#335195EA</color>
- <color name="dialer_secondary_color">#5195EA</color>
- <color name="dialer_ripple_color">#33ffffff</color>
- <color name="dialer_search_bar_color">@color/google_grey_900</color>
- <color name="settings_primary_dark">#2374CE</color>
-</resources>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M15,19v-2H8.41L20,5.41 18.59,4 7,15.59V9H5v10h10z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_close_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_close_vd_theme_24.xml
index 673b510..c63139c 100644
--- a/assets/quantum/res/drawable/quantum_ic_close_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_close_vd_theme_24.xml
@@ -18,8 +18,8 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
- android:tint="?attr/colorControlNormal">
+ android:tint="@*android:color/system_accent1_500">
<path
android:fillColor="@android:color/white"
- android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+ android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_close_white_24.xml b/assets/quantum/res/drawable/quantum_ic_close_white_24.xml
new file mode 100644
index 0000000..2f6a19d
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_close_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_delete_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_delete_vd_theme_24.xml
index 900b559..5f2b7c7 100644
--- a/assets/quantum/res/drawable/quantum_ic_delete_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_delete_vd_theme_24.xml
@@ -16,10 +16,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:tint="?attr/colorControlNormal"
+ android:tint="@*android:color/system_accent1_400"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="@android:color/white"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_dialpad_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_dialpad_vd_theme_24.xml
index 4e340ed..3984779 100644
--- a/assets/quantum/res/drawable/quantum_ic_dialpad_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_dialpad_vd_theme_24.xml
@@ -22,4 +22,4 @@
<path
android:fillColor="@android:color/white"
android:pathData="M12,19c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_dialpad_white_24.xml b/assets/quantum/res/drawable/quantum_ic_dialpad_white_24.xml
new file mode 100644
index 0000000..cf033c7
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_dialpad_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M12,19c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_fullscreen_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_fullscreen_vd_theme_24.xml
index baa88f4..55cd3bf 100644
--- a/assets/quantum/res/drawable/quantum_ic_fullscreen_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_fullscreen_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+ android:pathData="M17.5,7C15.01,7 13,9.01 13,11.5c0,0.93 0.28,1.78 0.76,2.5h-3.52c0.48,-0.72 0.76,-1.57 0.76,-2.5C11,9.01 8.99,7 6.5,7S2,9.01 2,11.5 4.01,16 6.5,16h11c2.49,0 4.5,-2.01 4.5,-4.5S19.99,7 17.5,7zM4,11.5C4,10.12 5.12,9 6.5,9S9,10.12 9,11.5 7.88,14 6.5,14 4,12.88 4,11.5zM17.5,14c-1.38,0 -2.5,-1.12 -2.5,-2.5S16.12,9 17.5,9s2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml
index c513feb..b07adf2 100644
--- a/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM11,15L9.5,15v-2h-2v2L6,15L6,9h1.5v2.5h2L9.5,9L11,9v6zM13,9h4c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1h-4L13,9zM14.5,13.5h2v-3h-2v3z"/>
+ android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM7.5,13h2v2L11,15L11,9L9.5,9v2.5h-2L7.5,9L6,9v6h1.5zM18,14v-4c0,-0.55 -0.45,-1 -1,-1h-4v6h4c0.55,0 1,-0.45 1,-1zM16.5,13.5h-2v-3h2v3z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_hd_white_24.xml b/assets/quantum/res/drawable/quantum_ic_hd_white_24.xml
new file mode 100644
index 0000000..474e60c
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_hd_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM7.5,13h2v2L11,15L11,9L9.5,9v2.5h-2L7.5,9L6,9v6h1.5zM18,14v-4c0,-0.55 -0.45,-1 -1,-1h-4v6h4c0.55,0 1,-0.45 1,-1zM16.5,13.5h-2v-3h2v3z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_language_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_language_vd_theme_24.xml
index a0d76c2..93f75b1 100644
--- a/assets/quantum/res/drawable/quantum_ic_language_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_language_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<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,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+ 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,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_language_white_24.xml b/assets/quantum/res/drawable/quantum_ic_language_white_24.xml
new file mode 100644
index 0000000..bd568b0
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_language_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <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,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_message_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_message_vd_theme_24.xml
index a285865..1d368db 100644
--- a/assets/quantum/res/drawable/quantum_ic_message_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_message_vd_theme_24.xml
@@ -18,7 +18,7 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
- android:tint="?attr/colorControlNormal">
+ android:tint="@*android:color/system_accent1_400">
<path
android:fillColor="@android:color/white"
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
diff --git a/assets/quantum/res/drawable/quantum_ic_mic_off_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_mic_off_vd_theme_24.xml
index 0519c55..c2b61b0 100644
--- a/assets/quantum/res/drawable/quantum_ic_mic_off_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_mic_off_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M19,11h-1.7c0,0.74 -0.16,1.43 -0.43,2.05l1.23,1.23c0.56,-0.98 0.9,-2.09 0.9,-3.28zM14.98,11.17c0,-0.06 0.02,-0.11 0.02,-0.17L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v0.18l5.98,5.99zM4.27,3L3,4.27l6.01,6.01L9.01,11c0,1.66 1.33,3 2.99,3 0.22,0 0.44,-0.03 0.65,-0.08l1.66,1.66c-0.71,0.33 -1.5,0.52 -2.31,0.52 -2.76,0 -5.3,-2.1 -5.3,-5.1L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c0.91,-0.13 1.77,-0.45 2.54,-0.9L19.73,21 21,19.73 4.27,3z"/>
-</vector>
\ No newline at end of file
+ android:pathData="M11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5.17l1.82,1.82c0.11,-0.31 0.18,-0.64 0.18,-0.99V5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v1.17l2,2V5zM2.81,2.81L1.39,4.22l11.65,11.65c-0.33,0.08 -0.68,0.13 -1.04,0.13 -2.76,0 -5,-2.24 -5,-5H5c0,3.53 2.61,6.43 6,6.92V21h2v-3.08c0.57,-0.08 1.12,-0.24 1.64,-0.46l5.14,5.14 1.41,-1.41L2.81,2.81zM19,11h-2c0,0.91 -0.26,1.75 -0.69,2.48l1.46,1.46C18.54,13.82 19,12.47 19,11z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_mic_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_mic_vd_theme_24.xml
index 6220e39..e07f0e8 100644
--- a/assets/quantum/res/drawable/quantum_ic_mic_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_mic_vd_theme_24.xml
@@ -18,8 +18,8 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
- android:tint="?attr/colorControlNormal">
+ android:tint="@*android:color/system_accent1_500">
<path
android:fillColor="@android:color/white"
- android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+ android:pathData="M12,14c1.66,0 3,-1.34 3,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,5zM17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5L5,11c0,3.53 2.61,6.43 6,6.92L11,21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92h-2z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_more_vert_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
index bcdd000..4f2fa07 100644
--- a/assets/quantum/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
@@ -18,7 +18,7 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
- android:tint="?attr/colorControlNormal">
+ android:tint="@*android:color/system_accent1_500">
<path
android:fillColor="@android:color/white"
android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
diff --git a/assets/quantum/res/drawable/quantum_ic_more_vert_white_24.xml b/assets/quantum/res/drawable/quantum_ic_more_vert_white_24.xml
new file mode 100644
index 0000000..850aa7c
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_more_vert_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_pause_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_pause_vd_theme_24.xml
index b683a3b..55c14bc 100644
--- a/assets/quantum/res/drawable/quantum_ic_pause_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_pause_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
\ No newline at end of file
+ android:pathData="M19,19h-6L13,5h6v14zM15,17h2L17,7h-2v10zM11,19L5,19L5,5h6v14zM7,17h2L9,7L7,7v10z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_record_white_36.xml b/assets/quantum/res/drawable/quantum_ic_record_white_36.xml
index 35aaa41..cb1e535 100644
--- a/assets/quantum/res/drawable/quantum_ic_record_white_36.xml
+++ b/assets/quantum/res/drawable/quantum_ic_record_white_36.xml
@@ -1,9 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="36dp"
- android:width="36dp"
+ android:height="24dp"
+ android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M19,12C19,15.86 15.86,19 12,19C8.14,19 5,15.86 5,12C5,8.14 8.14,5 12,5C15.86,5 19,8.14 19,12Z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M8 12a 4 4 0 1 0 8 0a4 4 0 1 0 -8 0" />
+ <path
+ android:pathData="M2.75 12a 9.25 9.25 0 1 0 18.5 0a9.25 9.25 0 1 0 -18.5 0"
+ android:strokeColor="@android:color/white"
+ android:strokeWidth="1.5" />
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_rtt_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_rtt_vd_theme_24.xml
index 90e1f84..614cad6 100644
--- a/assets/quantum/res/drawable/quantum_ic_rtt_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_rtt_vd_theme_24.xml
@@ -22,4 +22,4 @@
<path
android:fillColor="@android:color/white"
android:pathData="M9.03,3l-1.11,7.07h2.62l0.7,-4.5h2.58L11.8,18.43L9.47,18.43L9.06,21h7.27l0.4,-2.57h-2.35l2,-12.86h2.58l-0.71,4.5h2.65L22,3L9.03,3zM8,5L4,5l-0.31,2h4L8,5zM7.39,9h-4l-0.31,2h4l0.31,-2zM8.31,17h-6L2,19h6l0.31,-2zM8.93,13h-6l-0.31,2h6.01l0.3,-2z"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_search_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_search_vd_theme_24.xml
index 3c5d086..88accac 100644
--- a/assets/quantum/res/drawable/quantum_ic_search_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_search_vd_theme_24.xml
@@ -18,8 +18,8 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
- android:tint="?attr/colorControlNormal">
+ android:tint="@*android:color/system_accent1_500">
<path
android:fillColor="@android:color/white"
- android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+ android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49 20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5 11.99,14 9.5,14 5,11.99 5,9.5z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24.xml
index 8f0b0d2..02b4979 100644
--- a/assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+ android:pathData="M1,9l11,11L23,9C16.92,2.92 7.08,2.92 1,9z"/>
</vector>
diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_white_24.xml
similarity index 60%
copy from java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
copy to assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_white_24.xml
index 8d04c72..9a54bd0 100644
--- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
+++ b/assets/quantum/res/drawable/quantum_ic_signal_wifi_4_bar_white_24.xml
@@ -13,12 +13,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<resources>
- <!-- Essential theme colors -->
- <color name="dialer_theme_color">#5195EA</color>
- <color name="dialer_theme_color_20pct">#335195EA</color>
- <color name="dialer_secondary_color">#5195EA</color>
- <color name="dialer_ripple_color">#33ffffff</color>
- <color name="dialer_search_bar_color">@color/google_grey_900</color>
- <color name="settings_primary_dark">#2374CE</color>
-</resources>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M1,9l11,11L23,9C16.92,2.92 7.08,2.92 1,9z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_swap_calls_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_swap_calls_vd_theme_24.xml
index e05fb1b..704e0d3 100644
--- a/assets/quantum/res/drawable/quantum_ic_swap_calls_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_swap_calls_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M18,4l-4,4h3v7c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2V8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8v7H2l4,4 4,-4H7V8c0,-1.1 0.9,-2 2,-2s2,0.9 2,2v7c0,2.21 1.79,4 4,4s4,-1.79 4,-4V8h3l-4,-4z"/>
+ android:pathData="M22.24,8.24L18,4l-4.24,4.24 1.41,1.41L17,7.83V15c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2V8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8v7.17l-1.83,-1.83 -1.41,1.41L6,19l4.24,-4.24 -1.41,-1.41L7,15.17V8c0,-1.1 0.9,-2 2,-2s2,0.9 2,2v7c0,2.21 1.79,4 4,4s4,-1.79 4,-4V7.83l1.83,1.83 1.41,-1.42z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_videocam_off_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_videocam_off_vd_theme_24.xml
index cce9eab..709ad53 100644
--- a/assets/quantum/res/drawable/quantum_ic_videocam_off_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_videocam_off_vd_theme_24.xml
@@ -21,6 +21,6 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M21,6.5l-4,4V7c0,-0.55 -0.45,-1 -1,-1H9.82L21,17.18V6.5zM3.27,2L2,3.27 4.73,6H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.21,0 0.39,-0.08 0.54,-0.18L19.73,21 21,19.73 3.27,2z"/>
+ android:pathData="M2.36853 3L1 4.37106L2.40094 5.79805C2.14921 6.13266 1.99998 6.54892 1.99998 7.00006V17.0001C1.99998 18.1046 2.89451 19.0001 3.99798 19.0001H14.987C15.1048 19.0001 15.2204 18.9898 15.3326 18.9702L17.6959 21.3775L19.0917 19.9791L19.0425 19.929L2.36853 3ZM17.3132 15.3194L20.4815 17.3401C20.6355 17.444 20.8154 17.5028 21.0009 17.5101C21.5527 17.5101 21.9999 17.0623 21.9999 16.5101V7.51006C22.0027 7.23961 21.8959 6.97958 21.7039 6.78928C21.5119 6.59898 21.2511 6.49464 20.981 6.50006C20.7954 6.50729 20.6155 6.56616 20.4615 6.67006L16.985 8.89006V7.00006C16.985 5.89549 16.0904 5.00006 14.987 5.00006H7.14926L9.11913 7.00006H14.987V12.9576L17.3132 15.3194ZM3.99798 17.0001V7.42479L13.3984 17.0001H3.99798ZM19.982 14.6801L16.985 12.7401V11.2601L19.982 9.32006V14.6801Z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_videocam_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_videocam_vd_theme_24.xml
index 46c730c..73ac219 100644
--- a/assets/quantum/res/drawable/quantum_ic_videocam_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_videocam_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
+ android:pathData="M21 6.5C20.8142 6.50723 20.6342 6.5661 20.48 6.67L17 8.89V7C17 5.89543 16.1046 5 15 5H4C2.89543 5 2 5.89543 2 7V17C2 18.1046 2.89543 19 4 19H15C16.1046 19 17 18.1046 17 17V15.11L20.5 17.34C20.6542 17.4439 20.8342 17.5028 21.02 17.51C21.5723 17.51 22.02 17.0623 22.02 16.51V7.51C22.0228 7.23955 21.9159 6.97952 21.7237 6.78922C21.5315 6.59892 21.2704 6.49458 21 6.5ZM15 17H4V7H15V17ZM20 14.68L17 12.74V11.26L20 9.32V14.68Z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_videocam_vd_white_24.xml b/assets/quantum/res/drawable/quantum_ic_videocam_vd_white_24.xml
index 27420ca..2236c73 100644
--- a/assets/quantum/res/drawable/quantum_ic_videocam_vd_white_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_videocam_vd_white_24.xml
@@ -20,5 +20,5 @@
android:viewportHeight="24.0">
<path
android:fillColor="@android:color/white"
- android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
+ android:pathData="M21 6.5C20.8142 6.50723 20.6342 6.5661 20.48 6.67L17 8.89V7C17 5.89543 16.1046 5 15 5H4C2.89543 5 2 5.89543 2 7V17C2 18.1046 2.89543 19 4 19H15C16.1046 19 17 18.1046 17 17V15.11L20.5 17.34C20.6542 17.4439 20.8342 17.5028 21.02 17.51C21.5723 17.51 22.02 17.0623 22.02 16.51V7.51C22.0228 7.23955 21.9159 6.97952 21.7237 6.78922C21.5315 6.59892 21.2704 6.49458 21 6.5ZM15 17H4V7H15V17ZM20 14.68L17 12.74V11.26L20 9.32V14.68Z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_voicemail_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_voicemail_vd_theme_24.xml
index 1f33d75..55cd3bf 100644
--- a/assets/quantum/res/drawable/quantum_ic_voicemail_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_voicemail_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M18.5,6C15.46,6 13,8.46 13,11.5c0,1.33 0.47,2.55 1.26,3.5L9.74,15c0.79,-0.95 1.26,-2.17 1.26,-3.5C11,8.46 8.54,6 5.5,6S0,8.46 0,11.5 2.46,17 5.5,17h13c3.04,0 5.5,-2.46 5.5,-5.5S21.54,6 18.5,6zM5.5,15C3.57,15 2,13.43 2,11.5S3.57,8 5.5,8 9,9.57 9,11.5 7.43,15 5.5,15zM18.5,15c-1.93,0 -3.5,-1.57 -3.5,-3.5S16.57,8 18.5,8 22,9.57 22,11.5 20.43,15 18.5,15z"/>
+ android:pathData="M17.5,7C15.01,7 13,9.01 13,11.5c0,0.93 0.28,1.78 0.76,2.5h-3.52c0.48,-0.72 0.76,-1.57 0.76,-2.5C11,9.01 8.99,7 6.5,7S2,9.01 2,11.5 4.01,16 6.5,16h11c2.49,0 4.5,-2.01 4.5,-4.5S19.99,7 17.5,7zM4,11.5C4,10.12 5.12,9 6.5,9S9,10.12 9,11.5 7.88,14 6.5,14 4,12.88 4,11.5zM17.5,14c-1.38,0 -2.5,-1.12 -2.5,-2.5S16.12,9 17.5,9s2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_volume_up_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_volume_up_vd_theme_24.xml
index ac14bec..b7b6a53 100644
--- a/assets/quantum/res/drawable/quantum_ic_volume_up_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_volume_up_vd_theme_24.xml
@@ -21,5 +21,5 @@
android:viewportWidth="24.0">
<path
android:fillColor="@android:color/white"
- android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
-</vector>
\ No newline at end of file
+ android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM10,8.83v6.34L7.83,13L5,13v-2h2.83L10,8.83zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77 0,-4.28 -2.99,-7.86 -7,-8.77z"/>
+</vector>
diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 771254e..0fe8f7e 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -23,9 +23,14 @@
import android.app.KeyguardManager;
import android.content.ContentResolver;
import android.content.Context;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.ContentObserver;
import android.database.Cursor;
+import android.graphics.Canvas;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -39,6 +44,8 @@
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.support.v7.widget.helper.ItemTouchHelper.SimpleCallback;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -70,6 +77,8 @@
import com.android.dialer.oem.CequintCallerIdManager;
import com.android.dialer.performancereport.PerformanceReport;
import com.android.dialer.phonenumbercache.ContactInfoHelper;
+import com.android.dialer.theme.base.Theme;
+import com.android.dialer.theme.base.ThemeComponent;
import com.android.dialer.util.PermissionsUtil;
import com.android.dialer.widget.EmptyContentView;
import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
@@ -295,8 +304,79 @@
return view;
}
+ private String concatCallIds(long[] callIds) {
+ if (callIds == null || callIds.length == 0) {
+ return null;
+ }
+
+ StringBuilder str = new StringBuilder();
+ for (long callId : callIds) {
+ if (str.length() != 0) {
+ str.append(",");
+ }
+ str.append(callId);
+ }
+
+ return str.toString();
+ }
+
protected void setupView(View view) {
recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
+ SimpleCallback simpleCallback = new SimpleCallback(50, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
+
+ @Override
+ public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+ return false;
+ }
+
+ @Override
+ public void onSwiped(RecyclerView.ViewHolder holder, int direction) {
+ if (holder instanceof CallLogListItemViewHolder){
+ CallLogListItemViewHolder viewHolder = ((CallLogListItemViewHolder)holder);
+ if (direction == ItemTouchHelper.LEFT){
+ getContext().startActivity(new Intent(Intent.ACTION_VIEW, Uri.fromParts("sms",viewHolder.number, null)));
+ adapter.notifyItemChanged(holder.getAdapterPosition());
+ } else {
+ //TODO: Make it thread safe
+ getContext()
+ .getContentResolver()
+ .delete(
+ CallLog.Calls.CONTENT_URI,
+ CallLog.Calls._ID + " IN (" + concatCallIds(viewHolder.callIds) + ")" /* where */,
+ null /* selectionArgs */);
+ }
+ }
+ }
+
+ @Override
+ public void onChildDraw(Canvas canvas, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+ if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+ boolean isTowardsRight = dX > 0;
+ Drawable icon = getResources().getDrawable(isTowardsRight ? R.drawable.quantum_ic_delete_vd_theme_24 : R.drawable.quantum_ic_message_vd_theme_24);
+ int iconHorizontalMargin = 20;
+ int halfIconSize = icon.getIntrinsicHeight() / 2;
+ int top = viewHolder.itemView.getTop() + ((viewHolder.itemView.getBottom() - viewHolder.itemView.getTop()) / 2 - halfIconSize);
+ icon = icon.mutate();
+ Theme theme = ThemeComponent.get(getContext()).theme();
+ icon.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
+ if (dX > 0) { // Right swipe
+ canvas.clipRect(viewHolder.itemView.getLeft(), viewHolder.itemView.getTop(), viewHolder.itemView.getLeft() + (int) dX, viewHolder.itemView.getBottom());
+ icon.setBounds(viewHolder.itemView.getLeft() + iconHorizontalMargin, top, viewHolder.itemView.getLeft() + iconHorizontalMargin + icon.getIntrinsicWidth(), top + icon.getIntrinsicHeight()
+ );
+ } else if (dX < 0) { // Left swipe
+ canvas.clipRect(viewHolder.itemView.getRight() + (int) dX, viewHolder.itemView.getTop(), viewHolder.itemView.getRight(), viewHolder.itemView.getBottom());
+ int imgLeft = viewHolder.itemView.getRight() - iconHorizontalMargin - halfIconSize * 2;
+ icon.setBounds(imgLeft, top, viewHolder.itemView.getRight() - iconHorizontalMargin, top + icon.getIntrinsicHeight());
+ }
+ icon.draw(canvas);
+ }
+ super.onChildDraw(canvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+ }
+ };
+
+ ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);
+ itemTouchHelper.attachToRecyclerView(recyclerView);
+
if (ConfigProviderComponent.get(getContext())
.getConfigProvider()
.getBoolean("is_call_log_item_anim_null", false)) {
@@ -310,7 +390,7 @@
recyclerView.setLayoutManager(layoutManager);
PerformanceReport.logOnScrollStateChange(recyclerView);
emptyListView = (EmptyContentView) view.findViewById(R.id.empty_list_view);
- emptyListView.setImage(R.drawable.empty_call_log);
+ emptyListView.setImage(R.drawable.oneplus_empty_call_log_illustration);
emptyListView.setActionClickedListener(this);
modalAlertView = (ViewGroup) view.findViewById(R.id.modal_message_container);
modalAlertManager =
diff --git a/java/com/android/dialer/app/list/OldSpeedDialFragment.java b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
index 9922ee2..1a7106f 100644
--- a/java/com/android/dialer/app/list/OldSpeedDialFragment.java
+++ b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
@@ -146,7 +146,7 @@
FragmentUtils.getParentUnsafe(this, HostInterface.class).getDragShadowOverlay());
emptyView = (EmptyContentView) parentView.findViewById(R.id.empty_list_view);
- emptyView.setImage(R.drawable.empty_speed_dial);
+ emptyView.setImage(R.drawable.oneplus_empty_speed_dial_illustration);
emptyView.setActionClickedListener(this);
contactTileFrame = parentView.findViewById(R.id.contact_tile_frame);
diff --git a/java/com/android/dialer/app/res/drawable-night-xxhdpi/oneplus_empty_call_log_illustration.png b/java/com/android/dialer/app/res/drawable-night-xxhdpi/oneplus_empty_call_log_illustration.png
new file mode 100644
index 0000000..558986b
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-night-xxhdpi/oneplus_empty_call_log_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-night-xxhdpi/oneplus_empty_speed_dial_illustration.png b/java/com/android/dialer/app/res/drawable-night-xxhdpi/oneplus_empty_speed_dial_illustration.png
new file mode 100644
index 0000000..5523786
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-night-xxhdpi/oneplus_empty_speed_dial_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/oneplus_empty_call_log_illustration.png b/java/com/android/dialer/app/res/drawable-xxhdpi/oneplus_empty_call_log_illustration.png
new file mode 100644
index 0000000..67b50d4
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/oneplus_empty_call_log_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/oneplus_empty_speed_dial_illustration.png b/java/com/android/dialer/app/res/drawable-xxhdpi/oneplus_empty_speed_dial_illustration.png
new file mode 100644
index 0000000..53baa63
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/oneplus_empty_speed_dial_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml b/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 9e3a20f..0000000
--- a/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <path
- android:pathData="M0,0h108v108h-108z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M66.578,37.789C66.859,37.226 67,36.613 67,36H62V38C62,39.105 61.105,40 60,40H52C50.896,40 50,39.105 50,38V36H45C45,36.613 45.141,37.226 45.422,37.789L47.422,41.789C48.1,43.144 49.485,44 51,44H61C62.515,44 63.9,43.144 64.578,41.789L66.578,37.789ZM67,72H45C45,71.387 45.141,70.774 45.422,70.211L47.422,66.211C48.1,64.856 49.485,64 51,64H61C62.515,64 63.9,64.856 64.578,66.211L66.578,70.211C66.859,70.774 67,71.387 67,72Z"
- android:fillColor="#CBDEFB"
- android:fillType="evenOdd"/>
-</vector>
diff --git a/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml b/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index ca7d11c..0000000
--- a/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <group>
- <clip-path
- android:pathData="M0,0h108v108h-108z"/>
- <path
- android:pathData="M47.422,77.789C48.1,79.144 49.485,80 51,80H61C62.515,80 63.9,79.144 64.578,77.789L66.578,73.789C67.141,72.663 67.141,71.337 66.578,70.211L64.578,66.211C63.9,64.856 62.515,64 61,64H51C49.485,64 48.1,64.856 47.422,66.211L45.422,70.211C44.859,71.337 44.859,72.663 45.422,73.789L47.422,77.789Z"
- android:fillColor="#193057"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M47.422,30.211C48.1,28.856 49.485,28 51,28H61C62.515,28 63.9,28.856 64.578,30.211L66.578,34.211C67.141,35.337 67.141,36.663 66.578,37.789L64.578,41.789C63.9,43.144 62.515,44 61,44H51C49.485,44 48.1,43.144 47.422,41.789L45.422,37.789C44.859,36.663 44.859,35.337 45.422,34.211L47.422,30.211Z"
- android:fillColor="#193057"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M41,54C41,43.751 43.836,37.383 45.422,34.211L47.425,30.209C48.102,28.855 49.486,28 51,28H61C59.486,28 58.102,28.855 57.425,30.209L55.422,34.211C53.836,37.383 51,43.751 51,54C51,64.249 53.836,70.617 55.422,73.789L57.425,77.791C58.102,79.145 59.486,80 61,80H51C49.486,80 48.102,79.145 47.425,77.791L45.422,73.789C43.836,70.617 41,64.249 41,54Z"
- android:fillColor="#4D84E9"/>
- <path
- android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
- android:fillAlpha="0.6">
- <aapt:attr name="android:fillColor">
- <gradient
- android:gradientRadius="72"
- android:centerX="28.54"
- android:centerY="28.54"
- android:type="radial">
- <item android:offset="0" android:color="#19FFFFFF"/>
- <item android:offset="1" android:color="#00FFFFFF"/>
- </gradient>
- </aapt:attr>
- </path>
- </group>
-</vector>
diff --git a/java/com/android/dialer/app/res/drawable/ic_launcher_monochrome.xml b/java/com/android/dialer/app/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index 7b3ef38..0000000
--- a/java/com/android/dialer/app/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <path
- android:pathData="M57.53,28H57.175H50C48.486,28 47.102,28.855 46.425,30.209L44.422,34.211C42.836,37.383 40,43.751 40,54C40,64.249 42.836,70.617 44.422,73.789L46.425,77.791C47.102,79.145 48.486,80 50,80H57.172H57.53H60.53H61C62.515,80 63.9,79.144 64.578,77.789L66.578,73.789C67.141,72.663 67.141,71.337 66.578,70.211L64.578,66.211C63.9,64.856 62.515,64 61,64H53.996C53.406,61.197 53,57.876 53,54C53,50.124 53.406,46.803 53.996,44H61C62.515,44 63.9,43.144 64.578,41.789L66.578,37.789C67.141,36.663 67.141,35.337 66.578,34.211L64.578,30.211C63.9,28.856 62.515,28 61,28H60.53H57.53ZM54.739,75.132L55.674,77H50C49.622,77 49.277,76.787 49.108,76.449L47.105,72.447L47.105,72.447C45.65,69.537 43,63.636 43,54C43,44.364 45.65,38.463 47.105,35.553L47.105,35.553L49.108,31.551C49.277,31.213 49.622,31 50,31H55.674L54.739,32.868L54.739,32.869C53.022,36.303 50,43.139 50,54C50,64.861 53.022,71.697 54.739,75.131L54.739,75.132Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
-</vector>
diff --git a/java/com/android/dialer/app/res/drawable/ic_monochrome.xml b/java/com/android/dialer/app/res/drawable/ic_monochrome.xml
new file mode 100644
index 0000000..087208c
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable/ic_monochrome.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+ android:viewportWidth="432"
+ android:viewportHeight="432"
+ android:width="108dp"
+ android:height="108dp">
+ <path
+ android:pathData="M148.5 144L184.5 144L188 146.5L191 171.5L194 179.5L194 187.5L175 207.5Q184.6 224.9 198.5 238Q209.8 249.7 225.5 257L244.5 238L252.5 238L266.5 242L283.5 243L287 245.5L288 247.5L288 283.5L285.5 287L283.5 288L262.5 288L241.5 284L222.5 277L202.5 265L183 249L167 229.5L152 202.5L145 176.5Q146.5 171 144 169.5L144 148.5L146.5 145L148.5 144ZM151 145L149 146L145 151L146 173L152 198Q163 226 182 246Q200 264 225 276L249 284L260 286L268 286L269 287L282 287L284 286L287 282L287 250L286 248L282 244L269 244L258 242L251 239L245 240L226 259L204 245Q184 230 173 207L191 189L193 185L188 164L188 151L187 149L183 145L151 145Z"
+ android:fillColor="#FFFFFE"
+ android:fillAlpha="0.3764706"
+ android:strokeColor="#FFFFFE"
+ android:strokeAlpha="0.3764706"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M150.5 145L182.5 145L187 148.5L188 150.5L188 163.5L193 184.5L191 188.5L173 206.5Q184.4 229.6 203.5 245L225.5 259L244.5 240L250.5 239L257.5 242L268.5 244L281.5 244L286 247.5L287 249.5L287 281.5L283.5 286L281.5 287L268.5 287L267.5 286L259.5 286L248.5 284L224.5 276Q199.6 264.4 182 245.5Q162.5 226 152 197.5L146 172.5L145 150.5L148.5 146L150.5 145Z"
+ android:fillColor="#FEFEFF"
+ android:fillAlpha="0.9960784"
+ android:strokeColor="#FEFEFF"
+ android:strokeAlpha="0.9960784"
+ android:strokeWidth="1" />
+</vector>
diff --git a/java/com/android/dialer/app/res/drawable/ic_pause.xml b/java/com/android/dialer/app/res/drawable/ic_pause.xml
index 7696eb0..3764ce1 100644
--- a/java/com/android/dialer/app/res/drawable/ic_pause.xml
+++ b/java/com/android/dialer/app/res/drawable/ic_pause.xml
@@ -16,16 +16,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false">
- <bitmap
- android:src="@drawable/quantum_ic_pause_white_24"
- android:tint="@color/voicemail_icon_disabled_tint"/>
- </item>
+ <item android:state_enabled="false"
+ android:drawable="@drawable/quantum_ic_pause_vd_theme_24"
+ android:tint="@color/voicemail_icon_disabled_tint"/>
- <item>
- <bitmap
- android:src="@drawable/quantum_ic_pause_white_24"
- android:tint="@color/voicemail_playpause_icon_tint"/>
- </item>
+ <item android:drawable="@drawable/quantum_ic_pause_vd_theme_24"
+ android:tint="@color/voicemail_playpause_icon_tint"/>
</selector>
diff --git a/java/com/android/dialer/app/res/mipmap-anydpi/ic_launcher.xml b/java/com/android/dialer/app/res/mipmap-anydpi/ic_launcher.xml
index b58c81f..c8b5591 100644
--- a/java/com/android/dialer/app/res/mipmap-anydpi/ic_launcher.xml
+++ b/java/com/android/dialer/app/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
+<!-- Copyright (c) 2018 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background"/>
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
- <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+ <background android:drawable="@mipmap/ic_background"/>
+ <foreground android:drawable="@mipmap/ic_foreground"/>
+ <monochrome android:drawable="@drawable/ic_monochrome" />
</adaptive-icon>
+
diff --git a/java/com/android/dialer/app/res/mipmap-hdpi/ic_background.png b/java/com/android/dialer/app/res/mipmap-hdpi/ic_background.png
new file mode 100644
index 0000000..d0f68ba
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-hdpi/ic_background.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-hdpi/ic_foreground.png b/java/com/android/dialer/app/res/mipmap-hdpi/ic_foreground.png
new file mode 100644
index 0000000..65f15fc
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-hdpi/ic_foreground.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-mdpi/ic_background.png b/java/com/android/dialer/app/res/mipmap-mdpi/ic_background.png
new file mode 100644
index 0000000..55f05fe
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-mdpi/ic_background.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-mdpi/ic_foreground.png b/java/com/android/dialer/app/res/mipmap-mdpi/ic_foreground.png
new file mode 100644
index 0000000..049a633
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-mdpi/ic_foreground.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xhdpi/ic_background.png b/java/com/android/dialer/app/res/mipmap-xhdpi/ic_background.png
new file mode 100644
index 0000000..6076ed3
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-xhdpi/ic_background.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xhdpi/ic_foreground.png b/java/com/android/dialer/app/res/mipmap-xhdpi/ic_foreground.png
new file mode 100644
index 0000000..4dc42ff
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-xhdpi/ic_foreground.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_background.png b/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_background.png
new file mode 100644
index 0000000..83d4bb9
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_background.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_foreground.png b/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_foreground.png
new file mode 100644
index 0000000..0bb6676
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_foreground.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_background.png b/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_background.png
new file mode 100644
index 0000000..fba7110
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_background.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_foreground.png b/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_foreground.png
new file mode 100644
index 0000000..1de54c0
--- /dev/null
+++ b/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_foreground.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/values-night/colors.xml b/java/com/android/dialer/app/res/values-night/colors.xml
index 1d165af..d5ff76b 100644
--- a/java/com/android/dialer/app/res/values-night/colors.xml
+++ b/java/com/android/dialer/app/res/values-night/colors.xml
@@ -15,6 +15,6 @@
-->
<resources>
- <color name="nav_item">#80FFFFFF</color>
- <color name="nav_item_selected">#FFFFFF</color>
+ <color name="nav_item">@*android:color/system_neutral1_300</color>
+ <color name="nav_item_selected">@*android:color/system_accent1_400</color>
</resources>
diff --git a/java/com/android/dialer/app/res/values-v27/styles.xml b/java/com/android/dialer/app/res/values-v27/styles.xml
index bc9b119..fcf033f 100644
--- a/java/com/android/dialer/app/res/values-v27/styles.xml
+++ b/java/com/android/dialer/app/res/values-v27/styles.xml
@@ -18,6 +18,6 @@
<style name="DialtactsTheme" parent="Dialer.ThemeBase.ActionBar">
<item name="android:windowLightNavigationBar">true</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item>
- <item name="android:navigationBarDividerColor">#E0E0E0</item>
+ <item name="android:navigationBarDividerColor">@null</item>
</style>
</resources>
diff --git a/java/com/android/dialer/app/res/values/cm_strings.xml b/java/com/android/dialer/app/res/values/cm_strings.xml
index 84d6ef7..3f7602d 100644
--- a/java/com/android/dialer/app/res/values/cm_strings.xml
+++ b/java/com/android/dialer/app/res/values/cm_strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013-2014 The CyanogenMod Project
- Copyright (C) 2018-2021 The LineageOS Project
+ Copyright (C) 2018 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@
<string name="call_recording_format">Audio format</string>
<string name="wb_amr_format" translatable="false">AMR-WB</string>
<string name="aac_format" translatable="false">AAC</string>
+ <string name="auto_call_recording_title">Auto call recording</string>
+ <string name="auto_call_recording_key" translatable="false">auto_call_recording</string>
<string name="call_via">Call via</string>
<string name="call_via_dialog_title">Call via\u2026</string>
<string name="call_log_stats_title">Statistics</string>
-
- <string name="action_menu_helplines">Helplines</string>
</resources>
diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml
index f59f4f1..a00137e 100644
--- a/java/com/android/dialer/app/res/values/colors.xml
+++ b/java/com/android/dialer/app/res/values/colors.xml
@@ -26,6 +26,6 @@
<!-- Colors for blocked numbers list -->
<color name="blocked_number_block_color">#F44336</color>
- <color name="nav_item">#80666666</color>
- <color name="nav_item_selected">#666666</color>
+ <color name="nav_item">@*android:color/system_neutral1_600</color>
+ <color name="nav_item_selected">@*android:color/system_accent1_600</color>
</resources>
diff --git a/java/com/android/dialer/app/res/xml/sound_settings.xml b/java/com/android/dialer/app/res/xml/sound_settings.xml
index aa02587..673ec56 100644
--- a/java/com/android/dialer/app/res/xml/sound_settings.xml
+++ b/java/com/android/dialer/app/res/xml/sound_settings.xml
@@ -83,6 +83,11 @@
android:entryValues="@array/call_recording_encoder_values"
android:defaultValue="0" />
+ <SwitchPreference
+ android:defaultValue="false"
+ android:key="@string/auto_call_recording_key"
+ android:title="@string/auto_call_recording_title"/>
+
</PreferenceCategory>
</PreferenceScreen>
diff --git a/java/com/android/dialer/calldetails/res/values/styles.xml b/java/com/android/dialer/calldetails/res/values/styles.xml
index 4b861f5..469ea65 100644
--- a/java/com/android/dialer/calldetails/res/values/styles.xml
+++ b/java/com/android/dialer/calldetails/res/values/styles.xml
@@ -16,7 +16,6 @@
-->
<resources>
<style name="CallDetailsActionItemStyle" parent="Dialer.TextAppearance.Secondary.Ellipsize">
- <item name="android:foreground">?android:attr/selectableItemBackground</item>
<item name="android:clickable">true</item>
<item name="android:drawablePadding">28dp</item>
<item name="android:gravity">center_vertical</item>
diff --git a/java/com/android/dialer/callstats/CallStatsFragment.java b/java/com/android/dialer/callstats/CallStatsFragment.java
index 3a90d93..fc49d3a 100644
--- a/java/com/android/dialer/callstats/CallStatsFragment.java
+++ b/java/com/android/dialer/callstats/CallStatsFragment.java
@@ -114,7 +114,7 @@
mLayoutManager = new LinearLayoutManager(getActivity());
mRecyclerView.setLayoutManager(mLayoutManager);
mEmptyListView = (EmptyContentView) view.findViewById(R.id.empty_list_view);
- mEmptyListView.setImage(R.drawable.empty_call_log);
+ mEmptyListView.setImage(R.drawable.oneplus_empty_call_log_illustration);
mEmptyListView.setActionClickedListener(this);
mSumHeaderView = (TextView) view.findViewById(R.id.sum_header);
diff --git a/java/com/android/dialer/contactsfragment/ContactsFragment.java b/java/com/android/dialer/contactsfragment/ContactsFragment.java
index f40abec..f63cf7d 100644
--- a/java/com/android/dialer/contactsfragment/ContactsFragment.java
+++ b/java/com/android/dialer/contactsfragment/ContactsFragment.java
@@ -202,7 +202,7 @@
recyclerView.setLayoutManager(manager);
emptyContentView = view.findViewById(R.id.empty_list_view);
- emptyContentView.setImage(R.drawable.empty_contacts);
+ emptyContentView.setImage(R.drawable.oneplus_empty_contacts_illustration);
emptyContentView.setActionClickedListener(this);
if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
diff --git a/java/com/android/dialer/contactsfragment/res/drawable-night/oneplus_empty_contacts_illustration.png b/java/com/android/dialer/contactsfragment/res/drawable-night/oneplus_empty_contacts_illustration.png
new file mode 100644
index 0000000..f125545
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/res/drawable-night/oneplus_empty_contacts_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/oneplus_empty_contacts_illustration.png b/java/com/android/dialer/contactsfragment/res/drawable/oneplus_empty_contacts_illustration.png
new file mode 100644
index 0000000..0a34628
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/res/drawable/oneplus_empty_contacts_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-land/rounded_dialpad_bg.xml b/java/com/android/dialer/dialpadview/res/drawable-land/rounded_dialpad_bg.xml
new file mode 100644
index 0000000..9be22fa
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/res/drawable-land/rounded_dialpad_bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/rounded_dialpad_bg_color" />
+</shape>
diff --git a/java/com/android/dialer/dialpadview/res/drawable/rounded_dialpad_bg.xml b/java/com/android/dialer/dialpadview/res/drawable/rounded_dialpad_bg.xml
new file mode 100644
index 0000000..64bbc18
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/res/drawable/rounded_dialpad_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/rounded_dialpad_bg_color" />
+ <corners
+ android:topLeftRadius="28dp"
+ android:topRightRadius="28dp" />
+</shape>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
index 3497d2a..65692c6 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
@@ -32,11 +32,6 @@
android:layout_height="0dp"
android:layout_weight="1"
android:background="#00000000"/>
- <!-- Dialpad shadow -->
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/shadow_length"
- android:background="@drawable/shadow_fade_up"/>
<include layout="@layout/dialpad_view"/>
<!-- "Dialpad chooser" UI, shown only when the user brings up the
Dialer while a call is already in progress.
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
index 9953fa3..0adc1e3 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
@@ -58,7 +58,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#e3e3e3"/>
+ android:background="@*android:color/transparent"/>
</LinearLayout>
@@ -75,13 +75,13 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="@dimen/dialpad_overflow_margin"
- android:paddingLeft="@dimen/dialpad_digits_menu_left_padding"
+ android:paddingLeft="@dimen/dialpad_digits_menu_right_padding"
android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
android:background="@drawable/btn_dialpad_key"
android:contentDescription="@string/description_dialpad_back"
android:gravity="center"
- android:src="@drawable/quantum_ic_close_white_24"
- android:tint="?colorIcon"
+ android:src="@drawable/quantum_ic_close_vd_theme_24"
+ android:tint="@*android:color/system_accent1_500"
android:tintMode="src_in"
android:visibility="gone"/>
@@ -95,8 +95,8 @@
android:background="@drawable/btn_dialpad_key"
android:contentDescription="@string/description_dialpad_overflow"
android:gravity="center"
- android:src="@drawable/quantum_ic_more_vert_white_24"
- android:tint="?colorIcon"
+ android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
+ android:tint="@*android:color/system_accent1_500"
android:tintMode="src_in"
android:visibility="gone"/>
<FrameLayout android:layout_width="0dp"
@@ -142,14 +142,14 @@
android:contentDescription="@string/description_delete_button"
android:src="@drawable/quantum_ic_backspace_white_24"
android:state_enabled="false"
- android:tint="?colorIcon"
+ android:tint="@*android:color/system_accent1_500"
android:tintMode="src_in"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#e3e3e3"/>
+ android:background="@*android:color/transparent"/>
<Space
android:layout_width="match_parent"
diff --git a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml
index 8705a17..d0aae2c 100644
--- a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml
+++ b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml
@@ -36,6 +36,6 @@
<item name="dialpad_text_color">?android:attr/textColorSecondary</item>
<item name="dialpad_text_color_primary">?android:attr/colorPrimary</item>
<item name="dialpad_text_color_secondary">?android:attr/textColorSecondary</item>
- <item name="dialpad_background">?android:attr/colorBackgroundFloating</item>
+ <item name="dialpad_background">@drawable/rounded_dialpad_bg</item>
</style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/helplines/AndroidManifest.xml b/java/com/android/dialer/helplines/AndroidManifest.xml
deleted file mode 100644
index a16c36c..0000000
--- a/java/com/android/dialer/helplines/AndroidManifest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License
- -->
-<manifest
- xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.dialer.helplines">
-
- <uses-permission android:name="android.permission.INTERNET" />
-
- <application>
-
- <activity
- android:name=".HelplineActivity"
- android:autoRemoveFromRecents="true"
- android:label="@string/helplines_name"
- android:theme="@android:style/Theme.DeviceDefault.Settings"
- android:excludeFromRecents="true">
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT"/>
- <data android:scheme="header"/>
- </intent-filter>
- </activity>
- </application>
-
-</manifest>
diff --git a/java/com/android/dialer/helplines/HelplineActivity.java b/java/com/android/dialer/helplines/HelplineActivity.java
deleted file mode 100755
index 810a1e8..0000000
--- a/java/com/android/dialer/helplines/HelplineActivity.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (C) 2019-2021 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.helplines;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.telephony.SubscriptionManager;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.webkit.CookieManager;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.android.dialer.R;
-import com.android.dialer.app.calllog.IntentProvider;
-import com.android.dialer.helplines.utils.HelplineUtils;
-
-import org.lineageos.lib.phone.spn.Item;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static android.graphics.Paint.UNDERLINE_TEXT_FLAG;
-
-public class HelplineActivity extends Activity {
-
- public static final String SHARED_PREFERENCES_KEY = "com.android.dialer.prefs";
-
- private static final String KEY_FIRST_LAUNCH = "pref_first_launch";
-
- private RecyclerView mRecyclerView;
- private LinearLayout mLoadingView;
- private LinearLayout mEmptyView;
- private ProgressBar mProgressBar;
-
- private HelplineAdapter mAdapter;
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstance) {
- super.onCreate(savedInstance);
-
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true);
- }
-
- setContentView(R.layout.activity_helplines);
- mRecyclerView = findViewById(R.id.helplines_list);
- mLoadingView = findViewById(R.id.helplines_loading);
- mEmptyView = findViewById(R.id.empty_view);
- mProgressBar = findViewById(R.id.helplines_progress_bar);
-
- mAdapter = new HelplineAdapter(getResources(), mListener);
-
- mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
- mRecyclerView.setAdapter(mAdapter);
-
- showUi();
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- finish();
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- MenuInflater menuInflater = getMenuInflater();
- menuInflater.inflate(R.menu.menu_helplines, menu);
- return super.onCreateOptionsMenu(menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- int id = item.getItemId();
- if (id == android.R.id.home) {
- finish();
- return true;
- } else if (id == R.id.menu_helpline_help) {
- showHelp(true);
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
-
- private void showUi() {
- mLoadingView.setVisibility(View.VISIBLE);
-
- showHelp(false);
- SubscriptionManager subManager = getSystemService(SubscriptionManager.class);
- new LoadHelplinesTask(getResources(), subManager, mCallback).execute();
- }
-
- private void showHelp(boolean forceShow) {
- SharedPreferences preferenceManager = getPrefs();
- if (!forceShow && preferenceManager.getBoolean(KEY_FIRST_LAUNCH, false)) {
- return;
- }
-
- preferenceManager.edit()
- .putBoolean(KEY_FIRST_LAUNCH, true)
- .apply();
-
- new AlertDialog.Builder(this)
- .setTitle(R.string.helplines_help_title)
- .setMessage(R.string.helplines_help_message)
- .setPositiveButton(android.R.string.ok, null)
- .setNeutralButton(R.string.helpline_button_more, (dialog, which) -> {
- showMoreInfo(); })
- .show();
- }
-
- private void showMoreInfo() {
- new AlertDialog.Builder(this)
- .setMessage(getResources().getString(R.string.helplines_help_more_message,
- getResources().getString(R.string.helplines_contact_url)))
- .setPositiveButton(android.R.string.ok, null)
- .show();
- }
-
- public SharedPreferences getPrefs() {
- return this.getSharedPreferences(SHARED_PREFERENCES_KEY,
- Context.MODE_PRIVATE);
- }
-
- private LoadHelplinesTask.Callback mCallback = new LoadHelplinesTask.Callback () {
- @Override
- public void onLoadListProgress(int progress) {
- mProgressBar.setProgress(progress);
- }
-
- @Override
- public void onLoadCompleted(List<HelplineItem> result) {
- mLoadingView.setVisibility(View.GONE);
- if (result.size() == 0) {
- mEmptyView.setVisibility(View.VISIBLE);
- } else {
- mRecyclerView.setVisibility(View.VISIBLE);
- }
- mAdapter.update(result);
- }
- };
-
- private HelplineAdapter.Listener mListener = new HelplineAdapter.Listener() {
- private AlertDialog mDialog;
-
- @Override
- public void initiateCall(@NonNull String number) {
- IntentProvider provider = IntentProvider.getReturnCallIntentProvider(number);
- Intent intent = provider.getClickIntent(HelplineActivity.this);
- // Start the call and finish this activity - we don't want to leave traces of the call
- startActivity(intent);
- finish();
- }
-
- @Override
- public void onItemClicked(@NonNull HelplineItem helplineItem) {
- LayoutInflater inflater = LayoutInflater.from(HelplineActivity.this);
- final View dialogView = inflater.inflate(R.layout.dialog_helpline_details, null);
- Item item = helplineItem.getItem();
-
- fillOrHideDialogRow(helplineItem.getName(), dialogView, R.id.name_title, R.id.name);
- fillOrHideDialogRow(item.getOrganization(), dialogView, R.id.org_title, R.id.org);
- fillOrHideDialogRow(HelplineUtils.getCategories(getResources(), helplineItem),
- dialogView, R.id.categories_title, R.id.categories);
- fillOrHideDialogRow(item.getNumber(), dialogView, R.id.number_title, R.id.number);
- fillOrHideDialogRow(item.getWebsite(), dialogView, R.id.website_title, R.id.website,
- true);
-
- mDialog = new AlertDialog.Builder(HelplineActivity.this)
- .setView(dialogView)
- .setPositiveButton(android.R.string.ok, null)
- .show();
- }
-
- private void fillOrHideDialogRow(String content, View dialog, int headerViewId,
- int contentViewId) {
- fillOrHideDialogRow(content, dialog, headerViewId, contentViewId, false);
- }
-
- private void fillOrHideDialogRow(String content, View dialogView, int headerViewId,
- int contentViewId, boolean isUrl) {
- if (dialogView == null) {
- return;
- }
- TextView headerView = dialogView.findViewById(headerViewId);
- TextView contentView = dialogView.findViewById(contentViewId);
- if (headerView == null || contentView == null) {
- return;
- }
- if (TextUtils.isEmpty(content)) {
- headerView.setVisibility(View.GONE);
- contentView.setVisibility(View.GONE);
- return;
- }
-
- contentView.setText(content);
- if (isUrl) {
- contentView.setPaintFlags(contentView.getPaintFlags() | UNDERLINE_TEXT_FLAG);
-
- LayoutInflater inflater = HelplineActivity.this.getLayoutInflater();
- contentView.setOnClickListener(v -> {
- AlertDialog.Builder dialogBuilder =
- new AlertDialog.Builder(HelplineActivity.this);
- View webviewDlgView = inflater.inflate(R.layout.dialog_webview, null);
- dialogBuilder.setView(webviewDlgView);
- LinearLayout loadingLayout = webviewDlgView.findViewById(R.id.webview_loading);
-
- // Disable cookies
- CookieManager.getInstance().setAcceptCookie(false);
- // Setup WebView
- WebView webView = webviewDlgView.findViewById(R.id.webview);
- webView.setWebViewClient(new WebViewClient() {
- @Override
- public boolean shouldOverrideUrlLoading(WebView view,
- WebResourceRequest request) {
- return false;
- }
-
- @Override
- public void onPageFinished(WebView view, String url) {
- super.onPageFinished(view, url);
- loadingLayout.setVisibility(ProgressBar.INVISIBLE);
- webView.setVisibility(View.VISIBLE);
- }
- });
- // Override headers to disable cache and add "Do not track"
- Map<String, String> headers = new HashMap<>(3);
- headers.put("Pragma", "no-cache");
- headers.put("Cache-Control", "no-cache");
- headers.put("DNT", "1");
- // Start loading the URL
- webView.loadUrl(content, headers);
- // Clear any WebView history
- dialogBuilder.setPositiveButton(android.R.string.ok, (dlg, which) -> {
- webView.clearHistory();
- dlg.dismiss();
- });
- dialogBuilder.setOnDismissListener(dialog -> webView.clearHistory());
- dialogBuilder.show();
- // dismiss the dialog, we show a new one already
- mDialog.dismiss();
- });
- }
- }
- };
-}
diff --git a/java/com/android/dialer/helplines/HelplineAdapter.java b/java/com/android/dialer/helplines/HelplineAdapter.java
deleted file mode 100644
index 7a1a563..0000000
--- a/java/com/android/dialer/helplines/HelplineAdapter.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2019-2021 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.helplines;
-
-import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.v7.util.DiffUtil;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.dialer.R;
-import com.android.dialer.helplines.utils.HelplineUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class HelplineAdapter extends RecyclerView.Adapter<HelplineAdapter.ViewHolder> {
-
- private Resources mResources;
- private List<HelplineItem> mList = new ArrayList<>();
- private Listener mListener;
-
- HelplineAdapter(Resources resources, Listener listener) {
- mResources = resources;
- mListener = listener;
- }
-
- public void update(List<HelplineItem> list) {
- DiffUtil.DiffResult result = DiffUtil.calculateDiff(new Callback(mList, list));
- mList = list;
- result.dispatchUpdatesTo(this);
- }
-
- @NonNull
- @Override
- public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int type) {
- return new ViewHolder(LayoutInflater.from(parent.getContext())
- .inflate(R.layout.item_helpline, parent, false));
- }
-
- @Override
- public void onBindViewHolder(@NonNull ViewHolder viewHolder, int i) {
- viewHolder.bind(mList.get(i));
- }
-
- @Override
- public int getItemCount() {
- return mList.size();
- }
-
- public interface Listener {
- void initiateCall(@NonNull String number);
-
- void onItemClicked(@NonNull HelplineItem item);
- }
-
- private static class Callback extends DiffUtil.Callback {
- List<HelplineItem> mOldList;
- List<HelplineItem> mNewList;
-
- public Callback(List<HelplineItem> oldList,
- List<HelplineItem> newList) {
- mOldList = oldList;
- mNewList = newList;
- }
-
- @Override
- public int getOldListSize() {
- return mOldList.size();
- }
-
- @Override
- public int getNewListSize() {
- return mNewList.size();
- }
-
- @Override
- public boolean areItemsTheSame(int iOld, int iNew) {
- String oldNumber = mOldList.get(iOld).getItem().getNumber();
- String newNumber = mOldList.get(iNew).getItem().getNumber();
- return oldNumber.equals(newNumber);
- }
-
- @Override
- public boolean areContentsTheSame(int iOld, int iNew) {
- return false;
- }
- }
-
- class ViewHolder extends RecyclerView.ViewHolder {
- private final View mItemView;
- private final TextView mLabelView;
- private final TextView mCategoriesView;
- private final TextView mLanguageView;
- private final ImageView mCallIcon;
-
- ViewHolder(@NonNull View itemView) {
- super(itemView);
-
- mItemView = itemView;
- mLabelView = itemView.findViewById(R.id.item_helpline_title);
- mCategoriesView = itemView.findViewById(R.id.item_helpline_categories);
- mLanguageView = itemView.findViewById(R.id.item_helpline_languages);
- mCallIcon = itemView.findViewById(R.id.item_helpline_call_icon);
- }
-
- void bind(HelplineItem item) {
- mItemView.setOnClickListener(v -> {
- mListener.onItemClicked(item);
- });
-
- String name = item.getName();
- if (!TextUtils.isEmpty(name)) {
- mLabelView.setText(name);
- } else {
- mLabelView.setText(R.string.unknown_helpline_name);
- }
-
- String categories = HelplineUtils.getCategories(mResources, item);
- if (!TextUtils.isEmpty(categories)) {
- mCategoriesView.setText(categories);
- mCategoriesView.setVisibility(View.VISIBLE);
- }
-
- String languages = HelplineUtils.getLanguages(mResources, item);
- if (!TextUtils.isEmpty(languages)) {
- mLanguageView.setVisibility(View.VISIBLE);
- mLanguageView.setText(languages);
- }
-
- String number = item.getItem().getNumber();
- if (!TextUtils.isEmpty(number)) {
- mCallIcon.setVisibility(View.VISIBLE);
- mCallIcon.setOnClickListener(v -> {
- mListener.initiateCall(number);
- });
- }
- }
- }
-}
diff --git a/java/com/android/dialer/helplines/HelplineItem.java b/java/com/android/dialer/helplines/HelplineItem.java
deleted file mode 100644
index e8f3d95..0000000
--- a/java/com/android/dialer/helplines/HelplineItem.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2019-2021 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.helplines;
-
-import android.content.res.Resources;
-
-import com.android.dialer.helplines.utils.HelplineUtils;
-
-import org.lineageos.lib.phone.spn.Item;
-
-/* When loading all the items we modify the name based on the subscription.
- * Using the setter would modify it permanently, resulting in modifications on each load.
- * Therefore we don't use Item directly but use this little helper class so the modified
- * name can be stored
- */
-public class HelplineItem {
- private final Item mItem;
- private final String mName;
-
- public HelplineItem(Resources res, Item item, String countryIso) {
- mItem = item;
- mName = HelplineUtils.getName(res, item, countryIso);
- }
-
- public Item getItem() {
- return mItem;
- }
-
- public String getName() {
- return mName;
- }
-}
diff --git a/java/com/android/dialer/helplines/LoadHelplinesTask.java b/java/com/android/dialer/helplines/LoadHelplinesTask.java
deleted file mode 100644
index 7c8de9c..0000000
--- a/java/com/android/dialer/helplines/LoadHelplinesTask.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2019-2021 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.helplines;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.util.Log;
-
-import org.lineageos.lib.phone.SensitivePhoneNumbers;
-import org.lineageos.lib.phone.spn.Item;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class LoadHelplinesTask extends AsyncTask<Void, Integer, List<HelplineItem>> {
-
- @NonNull
- private final Resources mResources;
- @NonNull
- private final SubscriptionManager mSubManager;
- @NonNull
- private final Callback mCallback;
-
- LoadHelplinesTask(@NonNull Resources resources, @NonNull SubscriptionManager subManager,
- @NonNull Callback callback) {
- mResources = resources;
- mSubManager = subManager;
- mCallback = callback;
- }
-
- @Override
- protected List<HelplineItem> doInBackground(Void... voids) {
- List<HelplineItem> helplineList = new ArrayList<>();
- /* when the network's and the user's country iso differ from each other,
- * include the iso code in the name so one can be sure that the number is the correct one
- * (think of accidential roaming close to the country border) */
- boolean addCountryCode = false;
-
- List<SubscriptionInfo> subList = getSubscriptionInfos();
- if (subList != null) {
- String localeCountryIso =
- mResources.getConfiguration().locale.getCountry().toLowerCase();
- List<String> alreadyProcessedMccs = new ArrayList<>();
- for (SubscriptionInfo subInfo : subList) {
- String subCountryIso = subInfo.getCountryIso();
- if (!subCountryIso.equals(localeCountryIso)) {
- addCountryCode = true;
- }
-
- String mcc = String.valueOf(subInfo.getMcc());
- if (alreadyProcessedMccs.contains(mcc)) {
- continue;
- }
- alreadyProcessedMccs.add(mcc);
-
- SensitivePhoneNumbers spn = SensitivePhoneNumbers.getInstance();
- ArrayList<Item> pns = spn.getSensitivePnInfosForMcc(mcc);
- int numPns = pns.size();
- for (int i = 0; i < numPns; i++) {
- Item item = pns.get(i);
- helplineList.add(new HelplineItem(mResources, item,
- addCountryCode ? subCountryIso : ""));
- publishProgress(Math.round(i * 100 / numPns / subList.size()));
- }
- }
- }
-
- Collections.sort(helplineList, (a, b) -> a.getName().compareTo(b.getName()));
-
- return helplineList;
- }
-
- private List<SubscriptionInfo> getSubscriptionInfos() {
- List<SubscriptionInfo> subList = mSubManager.getActiveSubscriptionInfoList();
- if (subList == null) {
- SubscriptionInfo info = mSubManager.getActiveSubscriptionInfo(
- SubscriptionManager.getDefaultVoiceSubscriptionId());
- if (info != null) {
- subList = new ArrayList<>();
- subList.add(info);
- }
- }
- return subList;
- }
-
- @Override
- protected void onProgressUpdate(Integer... values) {
- if (values.length > 0) {
- mCallback.onLoadListProgress(values[0]);
- }
- }
-
- @Override
- protected void onPostExecute(List<HelplineItem> list) {
- mCallback.onLoadCompleted(list);
- }
-
- interface Callback {
- void onLoadListProgress(int progress);
-
- void onLoadCompleted(List<HelplineItem> result);
- }
-}
diff --git a/java/com/android/dialer/helplines/res/drawable/ic_help.xml b/java/com/android/dialer/helplines/res/drawable/ic_help.xml
deleted file mode 100644
index 51a32ec..0000000
--- a/java/com/android/dialer/helplines/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="?android:attr/colorAccent"
- android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,
-2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,
-1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
-</vector>
diff --git a/java/com/android/dialer/helplines/res/drawable/ic_helpline_call.xml b/java/com/android/dialer/helplines/res/drawable/ic_helpline_call.xml
deleted file mode 100644
index 5d67f03..0000000
--- a/java/com/android/dialer/helplines/res/drawable/ic_helpline_call.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/textColorPrimary">
- <path
- android:fillColor="?android:attr/textColorPrimary"
- android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
-</vector>
diff --git a/java/com/android/dialer/helplines/res/layout/activity_helplines.xml b/java/com/android/dialer/helplines/res/layout/activity_helplines.xml
deleted file mode 100644
index c4cac0a..0000000
--- a/java/com/android/dialer/helplines/res/layout/activity_helplines.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <android.support.v7.widget.RecyclerView
- android:id="@+id/helplines_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone" />
-
- <LinearLayout
- android:id="@+id/helplines_loading"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="vertical">
-
- <ProgressBar
- android:id="@+id/helplines_progress_bar"
- style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:max="100"
- android:paddingStart="32dp"
- android:paddingEnd="32dp"
- android:progress="0" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:text="@string/helplines_loading"
- android:textSize="16sp" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/empty_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="vertical"
- android:visibility="gone">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:gravity="center"
- android:text="@string/helplines_empty"
- android:textSize="16sp" />
- </LinearLayout>
-</LinearLayout>
diff --git a/java/com/android/dialer/helplines/res/layout/dialog_helpline_details.xml b/java/com/android/dialer/helplines/res/layout/dialog_helpline_details.xml
deleted file mode 100644
index 4b283b2..0000000
--- a/java/com/android/dialer/helplines/res/layout/dialog_helpline_details.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingStart="24dp"
- android:paddingTop="24dp"
- android:paddingEnd="24dp"
- android:paddingBottom="24dp">
-
- <TextView
- android:id="@+id/name_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/helpline_name"
- android:textSize="16dp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:text="Name here"
- android:textSize="16dp" />
-
- <TextView
- android:id="@+id/categories_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/helpline_categories"
- android:textSize="16dp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/categories"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:text="Categories here"
- android:textSize="16dp" />
-
- <TextView
- android:id="@+id/number_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/helpline_number"
- android:textSize="16dp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/number"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:text="Number here"
- android:textSize="16dp" />
-
- <TextView
- android:id="@+id/org_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/helpline_org"
- android:textSize="16dp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/org"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:text="Org here"
- android:textSize="16dp" />
-
- <TextView
- android:id="@+id/website_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/helpline_website"
- android:textSize="16dp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/website"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Website here"
- android:textSize="16dp" />
-</LinearLayout>
diff --git a/java/com/android/dialer/helplines/res/layout/dialog_webview.xml b/java/com/android/dialer/helplines/res/layout/dialog_webview.xml
deleted file mode 100644
index b21bff6..0000000
--- a/java/com/android/dialer/helplines/res/layout/dialog_webview.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <WebView
- android:id="@+id/webview"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone" />
-
- <LinearLayout
- android:id="@+id/webview_loading"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="vertical"
- android:layout_marginTop="32dp">
-
- <ProgressBar
- style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="32dp"
- android:paddingEnd="32dp"
- android:indeterminate="true"/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:text="@string/helplines_loading"
- android:textSize="16sp" />
- </LinearLayout>
-</LinearLayout>
diff --git a/java/com/android/dialer/helplines/res/layout/item_helpline.xml b/java/com/android/dialer/helplines/res/layout/item_helpline.xml
deleted file mode 100644
index 5160105..0000000
--- a/java/com/android/dialer/helplines/res/layout/item_helpline.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/item"
- android:background="?android:attr/selectableItemBackground"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:minHeight="48dp"
- android:paddingTop="8dp"
- android:paddingBottom="8dp">
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:layout_weight="1"
- android:orientation="vertical"
- android:layout_gravity="center_vertical">
-
- <TextView
- android:id="@+id/item_helpline_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top|start"
- tools:text="Title"
- android:textColor="?android:attr/textColorPrimary"
- android:textSize="@dimen/helpline_primary_text_size"/>
-
- <TextView
- android:id="@+id/item_helpline_categories"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- tools:text="Categories"
- android:textColor="?android:attr/textColorSecondary"
- android:visibility="gone"
- tools:visibility="visible"
- android:textSize="@dimen/helpline_secondary_text_size"/>
-
- <TextView
- android:id="@+id/item_helpline_languages"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- tools:text="Languages"
- android:textColor="?android:attr/textColorSecondary"
- android:visibility="gone"
- tools:visibility="visible"
- android:textSize="@dimen/helpline_secondary_text_size"/>
- </LinearLayout>
-
- <ImageView
- android:id="@+id/item_helpline_call_icon"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_gravity="center|end"
- android:layout_marginStart="16dp"
- android:layout_marginEnd="16dp"
- android:scaleType="center"
- android:background="?android:attr/selectableItemBackgroundBorderless"
- android:clickable="true"
- android:focusable="true"
- android:src="@drawable/ic_helpline_call"
- android:visibility="visible"/>
-</LinearLayout>
diff --git a/java/com/android/dialer/helplines/res/menu/menu_helplines.xml b/java/com/android/dialer/helplines/res/menu/menu_helplines.xml
deleted file mode 100644
index c4f99fc..0000000
--- a/java/com/android/dialer/helplines/res/menu/menu_helplines.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/menu_helpline_help"
- android:icon="@drawable/ic_help"
- android:showAsAction="always"
- android:title="@string/helplines_help" />
-</menu>
diff --git a/java/com/android/dialer/helplines/res/values/dimens.xml b/java/com/android/dialer/helplines/res/values/dimens.xml
deleted file mode 100644
index 20fec7e..0000000
--- a/java/com/android/dialer/helplines/res/values/dimens.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <dimen name="helpline_primary_text_size">16sp</dimen>
- <dimen name="helpline_secondary_text_size">12sp</dimen>
-</resources>
diff --git a/java/com/android/dialer/helplines/res/values/helpline_categories.xml b/java/com/android/dialer/helplines/res/values/helpline_categories.xml
deleted file mode 100644
index 72dbdf9..0000000
--- a/java/com/android/dialer/helplines/res/values/helpline_categories.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <string name="helpline_category_abuse">Abuse</string>
- <string name="helpline_category_acohol">Alcohol</string>
- <string name="helpline_category_addiction">Addiction</string>
- <string name="helpline_category_adolescents">Adolescents</string>
- <string name="helpline_category_adults">Adults</string>
- <string name="helpline_category_aids">AIDS</string>
- <string name="helpline_category_birth">Birth</string>
- <string name="helpline_category_bullying">Bullying</string>
- <string name="helpline_category_children">Children</string>
- <string name="helpline_category_crime">Crime</string>
- <string name="helpline_category_crime_victims">Crime victims</string>
- <string name="helpline_category_corruption">Corruption</string>
- <string name="helpline_category_discrimination">Discrimination</string>
- <string name="helpline_category_domestic_violence">Domestic violence</string>
- <string name="helpline_category_drugs">Drugs</string>
- <string name="helpline_category_emotional_support">Emotional support</string>
- <string name="helpline_category_family">Family</string>
- <string name="helpline_category_gambling">Gambling</string>
- <string name="helpline_category_gender">Gender</string>
- <string name="helpline_category_generic">Generic</string>
- <string name="helpline_category_hiv">HIV</string>
- <string name="helpline_category_human_rights">Human rights</string>
- <string name="helpline_category_human_trafficking">Human trafficking</string>
- <string name="helpline_category_immigration">Immigration</string>
- <string name="helpline_category_legal_aid">Legal aid</string>
- <string name="helpline_category_lgbtq">LGBTQ+</string>
- <string name="helpline_category_men">Men</string>
- <string name="helpline_category_mental_health">Mental health</string>
- <string name="helpline_category_missing_children">Missing children</string>
- <string name="helpline_category_mothers">Mothers</string>
- <string name="helpline_category_muslim">Muslim</string>
- <string name="helpline_category_parents">Parents</string>
- <string name="helpline_category_pregnancy">Pregnancy</string>
- <string name="helpline_category_psychological">Psychological</string>
- <string name="helpline_category_religion">Religion</string>
- <string name="helpline_category_senior">Seniors</string>
- <string name="helpline_category_sexual_abuse">Sexual abuse</string>
- <string name="helpline_category_sexual_assault">Sexual assault</string>
- <string name="helpline_category_sexual_rights">Sexual rights</string>
- <string name="helpline_category_sexuality">Sexuality</string>
- <string name="helpline_category_soldiers">Soldiers</string>
- <string name="helpline_category_suicide">Suicide prevention</string>
- <string name="helpline_category_trans">Transgender</string>
- <string name="helpline_category_veterans">Veterans</string>
- <string name="helpline_category_violence">Violence</string>
- <string name="helpline_category_war">War</string>
- <string name="helpline_category_women">Women</string>
- <string name="helpline_category_youth">Youth</string>
-</resources>
diff --git a/java/com/android/dialer/helplines/res/values/helpline_names.xml b/java/com/android/dialer/helplines/res/values/helpline_names.xml
deleted file mode 100644
index 5ca02ac..0000000
--- a/java/com/android/dialer/helplines/res/values/helpline_names.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
-
-</resources>
diff --git a/java/com/android/dialer/helplines/res/values/strings.xml b/java/com/android/dialer/helplines/res/values/strings.xml
deleted file mode 100644
index 3e5f4aa..0000000
--- a/java/com/android/dialer/helplines/res/values/strings.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="helplines_name">Helplines</string>
- <string name="helplines_loading">Loading\u2026</string>
- <string name="helplines_empty">No helplines found.\nInsert a SIM card and try again</string>
- <string name="helplines_help">Help</string>
- <string name="helplines_help_title">These are safe to call</string>
- <string name="helplines_help_message">None of these numbers appear in your call history.\nYou can click any item for more information</string>
-
- <string name="helplines_help_more_message">The list of helplines is filled with information that is updated manually by contributors. If you encounter any missing or wrong information, please feel free to contact us at <xliff:g id="helplines_contact_url" example="www.lineageos.org">%1$s</xliff:g></string>
- <string name="helplines_contact_url" translatable="false">www.lineageos.org</string>
-
- <string name="helpline_button_more">More</string>
-
- <string name="unknown_helpline_name">Unknown organization</string>
-
- <string name="helpline_name">Name</string>
- <string name="helpline_org">Organization</string>
- <string name="helpline_categories">Categories</string>
- <string name="helpline_number">Number</string>
- <string name="helpline_website">Website</string>
-
- <!-- Format for displaying a helpline name with the country - Example will resolve to "Emotional Support Hotline (US)" -->
- <string name="helpline_name_format_country"><xliff:g id="helpline_name" example="Emotional Support Helpline">%1$s</xliff:g> (<xliff:g id="helpline_county" example="US">%2$s</xliff:g>)</string>
-
- <string name="helpline_language_cree">Cree</string>
- <string name="helpline_language_english">English</string>
- <string name="helpline_language_french">French</string>
- <string name="helpline_language_german">German</string>
- <string name="helpline_language_inuktitut">Inuktitut</string>
- <string name="helpline_language_ojibway">Ojibway</string>
- <string name="helpline_language_turkish">Turkish</string>
-</resources>
diff --git a/java/com/android/dialer/helplines/res/values/styles.xml b/java/com/android/dialer/helplines/res/values/styles.xml
deleted file mode 100755
index 4df1e1c..0000000
--- a/java/com/android/dialer/helplines/res/values/styles.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019-2021 The LineageOS Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <style name="BaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
- <item name="android:windowBackground">@android:color/transparent</item>
- <item name="android:colorBackgroundCacheHint">@null</item>
- <item name="android:windowShowWallpaper">true</item>
- <item name="android:windowNoTitle">true</item>
- <item name="android:colorEdgeEffect">#FF757575</item>
- </style>
-
- <style name="BaseTheme.Dark" parent="@style/BaseTheme">
- <item name="android:textColorPrimary">#FFFFFFFF</item>
- <item name="android:textColorSecondary">#FFFFFFFF</item>
- <item name="android:textColorTertiary">#CCFFFFFF</item>
- <item name="android:textColorHint">#A0FFFFFF</item>
- <item name="android:colorControlHighlight">#A0FFFFFF</item>
- <item name="android:colorPrimary">#FF212121</item>
- </style>
-
- <!-- A derivative project can extend these themes to customize the application theme without
- affecting the base theme -->
- <style name="HelplineTheme" parent="@style/BaseTheme" />
- <style name="HelplineTheme.Dark" parent="@style/BaseTheme.Dark" />
-</resources>
diff --git a/java/com/android/dialer/helplines/utils/HelplineUtils.java b/java/com/android/dialer/helplines/utils/HelplineUtils.java
deleted file mode 100644
index a31a9ec..0000000
--- a/java/com/android/dialer/helplines/utils/HelplineUtils.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (C) 2019-2021 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.helplines.utils;
-
-import android.content.res.Resources;
-import android.text.TextUtils;
-
-import com.android.dialer.R;
-import com.android.dialer.helplines.HelplineItem;
-import org.lineageos.lib.phone.spn.Item;
-
-import java.util.ArrayList;
-
-public class HelplineUtils {
-
- private static final String TAG = HelplineUtils.class.getSimpleName();
- private static final String NAME_STR_FORMAT = "helpline_name_%s";
- private static final String CATEGORY_STR_FORMAT = "helpline_category_%s";
- private static final String LANGUAGE_STR_FORMAT = "helpline_language_%s";
-
- /* Get the name of the helpline, fall back to the number if not given */
- public static String getName(Resources res, Item item, String countryIso) {
- if (item != null) {
- String name = item.getName();
- String displayName = !TextUtils.isEmpty(name)
- ? getDisplayString(res, name, NAME_STR_FORMAT)
- : item.getNumber();
- if (!TextUtils.isEmpty(countryIso)) {
- return res.getString(R.string.helpline_name_format_country, displayName,
- countryIso);
- } else {
- return displayName;
- }
- }
-
- return "";
- }
-
- /* Split the given categories and translate them, fall back to "generic" if not given */
- public static String getCategories(Resources res, HelplineItem item) {
- if (item != null) {
- String str = getDisplayString(res, item.getItem().getCategories(), CATEGORY_STR_FORMAT);
- if (!TextUtils.isEmpty(str)) {
- return str;
- }
- }
-
- return res.getString(R.string.helpline_category_generic);
- }
-
- /* Split and translate the given languages, return empty string if not given */
- public static String getLanguages(Resources res, HelplineItem item) {
- if (item != null) {
- return getDisplayString(res, item.getItem().getLanguages(), LANGUAGE_STR_FORMAT);
- }
-
- return "";
- }
-
- /* Split the content at the pipe symbol and get a resource named according to each item
- matching a pattern
- */
- private static String getDisplayString(Resources res, String content, String pattern) {
- if (content != null && content.length() > 0) {
- String[] listItems = TextUtils.split(content, "\\|");
- ArrayList<String> list = new ArrayList<>();
- for (String item : listItems) {
- String l = ResourceUtils.getLocalizedString(res, item, pattern);
- list.add(l);
- }
- if (list.size() > 0) {
- return TextUtils.join(", ", list);
- }
- return content;
- }
- return "";
- }
-}
diff --git a/java/com/android/dialer/helplines/utils/ResourceUtils.java b/java/com/android/dialer/helplines/utils/ResourceUtils.java
deleted file mode 100644
index 7c6d403..0000000
--- a/java/com/android/dialer/helplines/utils/ResourceUtils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (C) 2016 The CyanogenMod project
- * Copyright (C) 2019 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.helplines.utils;
-
-import android.content.res.Resources;
-import android.util.Log;
-
-public class ResourceUtils {
-
- private static final String TAG = ResourceUtils.class.getSimpleName();
- private static final boolean DEBUG = false;
-
- public static String getLocalizedString(final Resources res,
- final String stringName,
- final String stringFormat) {
- String name = stringName.toLowerCase();
- final String[] nonTokens = { "'", ",", "- ", "-", "(", ")" };
- for (String token : nonTokens) {
- name = name.replace(token, "");
- }
- final String[] underscoreTokens = { " ", "/" };
- for (String token : underscoreTokens) {
- name = name.replace(token, "_");
- }
- final String nameRes = String.format(stringFormat, name);
- return getStringForResourceName(res, nameRes, stringName);
- }
-
- public static String getStringForResourceName(final Resources res,
- final String resourceName,
- final String defaultValue) {
- final int resId = res.getIdentifier(resourceName, "string", "com.android.dialer");
- if (resId <= 0) {
- if (DEBUG) Log.d(TAG, "No resource found for " + resourceName);
- return defaultValue;
- } else {
- return res.getString(resId);
- }
- }
-}
diff --git a/java/com/android/dialer/main/impl/MainSearchController.java b/java/com/android/dialer/main/impl/MainSearchController.java
index 515f11b..364f5bc 100644
--- a/java/com/android/dialer/main/impl/MainSearchController.java
+++ b/java/com/android/dialer/main/impl/MainSearchController.java
@@ -41,7 +41,6 @@
import com.android.dialer.dialpadview.DialpadFragment;
import com.android.dialer.dialpadview.DialpadFragment.DialpadListener;
import com.android.dialer.dialpadview.DialpadFragment.OnDialpadQueryChangedListener;
-import com.android.dialer.helplines.HelplineActivity;
import com.android.dialer.logging.DialerImpression;
import com.android.dialer.logging.Logger;
import com.android.dialer.logging.ScreenEvent;
@@ -480,8 +479,6 @@
} else if (menuItem.getItemId() == R.id.menu_call_history) {
final Intent intent = new Intent(activity, CallLogActivity.class);
activity.startActivity(intent);
- } else if (menuItem.getItemId() == R.id.menu_helplines) {
- activity.startActivity(new Intent(activity, HelplineActivity.class));
}
return false;
}
diff --git a/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java b/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java
index 798f01e..684f542 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 @@
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 0000000..2dfdb98
--- /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 0000000..b49f14e
--- /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 0000000..c287c70
--- /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/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 0000000..cfd5f6e
--- /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 0000000..af13a85
--- /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 0000000..5e5c8b9
--- /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 0000000..10f0cff
--- /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 0000000..3565372
--- /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 0000000..ad5f9c0
--- /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_bar_layout.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml
index 1dd60d8..2c051e4 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml
@@ -19,7 +19,7 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?android:attr/colorBackgroundFloating"
+ android:background="@color/rounded_dialpad_bg_color"
android:elevation="8dp">
<include
diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
index 25db637..9a8a8d5 100644
--- a/java/com/android/dialer/main/impl/res/layout/main_activity.xml
+++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
@@ -62,7 +62,7 @@
android:layout_gravity="end|bottom"
android:src="@drawable/quantum_ic_dialpad_white_24"
android:contentDescription="@string/dialpad_button_content_description"
- app:backgroundTint="?android:attr/colorAccent"/>
+ app:backgroundTint="@*android:color/system_accent1_600"/>
<include android:id="@+id/promotion_bottom_sheet"
layout="@layout/promotion_bottom_sheet"/>
diff --git a/java/com/android/dialer/main/impl/res/values-v27/styles.xml b/java/com/android/dialer/main/impl/res/values-v27/styles.xml
index 261012e..531ce7b 100644
--- a/java/com/android/dialer/main/impl/res/values-v27/styles.xml
+++ b/java/com/android/dialer/main/impl/res/values-v27/styles.xml
@@ -21,8 +21,8 @@
<style name="MainActivityTheme" parent="MainActivityThemeBase">
<!-- Used to change the navigation bar color -->
<item name="android:windowLightNavigationBar">true</item>
- <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>
- <item name="android:navigationBarDividerColor">#E0E0E0</item>
+ <item name="android:navigationBarColor">@color/rounded_dialpad_bg_color</item>
+ <item name="android:navigationBarDividerColor">@null</item>
</style>
<!-- Used on sdk 27 and above -->
@@ -30,7 +30,7 @@
<style name="MainActivityTheme.Dark" parent="MainActivityThemeBase.Dark">
<!-- Used to change the navigation bar color -->
<item name="android:windowLightNavigationBar">true</item>
- <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>
- <item name="android:navigationBarDividerColor">#E0E0E0</item>
+ <item name="android:navigationBarColor">@color/rounded_dialpad_bg_color</item>
+ <item name="android:navigationBarDividerColor">@null</item>
</style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml
index 2130db4..e181a19 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml
@@ -20,7 +20,7 @@
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@android:color/white" />
- <corners android:radius="8dp" />
+ <corners android:radius="30dp" />
</shape>
</item>
diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml
index ee3219e..6e25b8f 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml
@@ -17,5 +17,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/colorBackgroundSearchBar"/>
- <corners android:radius="8dp"/>
+ <corners android:radius="30dp"/>
</shape>
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
index 129aac9..d46e406 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
@@ -29,7 +29,6 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/search_bar_margin"
android:background="@drawable/search_bar_background_rounded_corners"
- android:elevation="4dp"
android:minHeight="@dimen/collapsed_search_bar_height">
<RelativeLayout
@@ -48,7 +47,7 @@
android:importantForAccessibility="no"
android:scaleType="center"
android:src="@drawable/quantum_ic_search_vd_theme_24"
- android:tint="?colorIcon"/>
+ android:tint="@*android:color/system_accent1_500"/>
<TextView
android:id="@+id/search_box_start_search"
@@ -71,7 +70,7 @@
android:contentDescription="@string/description_start_voice_search"
android:scaleType="center"
android:src="@drawable/quantum_ic_mic_vd_theme_24"
- android:tint="?colorIcon"/>
+ android:tint="@*android:color/system_accent1_500"/>
<ImageButton
android:id="@+id/main_options_menu_button"
@@ -82,7 +81,7 @@
android:contentDescription="@string/action_menu_overflow_description"
android:scaleType="center"
android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
- android:tint="?colorIcon"/>
+ android:tint="@*android:color/system_accent1_500"/>
</RelativeLayout>
<include layout="@layout/expanded_search_bar"/>
@@ -119,7 +118,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:src="@drawable/quantum_ic_close_vd_theme_24"
- android:tint="?colorIconOnUnthemedDarkBackground"/>
+ android:tint="@*android:color/system_accent1_500"/>
<TextView
android:id="@+id/remove_view_text"
diff --git a/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml b/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml
index c75a17d..0e354ce 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/menu/main_menu.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2018 The Android Open Source Project
- ~ Copyright (C) 2021 The LineageOS Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -30,10 +29,6 @@
android:visible="false"/>
<item
- android:id="@+id/menu_helplines"
- android:title="@string/action_menu_helplines"/>
-
- <item
android:id="@+id/settings"
android:title="@string/settings"
app:showAsAction="collapseActionView"/>
diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java
index 69ee376..376cb45 100644
--- a/java/com/android/dialer/postcall/PostCall.java
+++ b/java/com/android/dialer/postcall/PostCall.java
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2017 The Android Open Source Project
- * Copyright (C) 2020 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,8 +16,6 @@
package com.android.dialer.postcall;
-import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -43,8 +40,6 @@
import com.android.dialer.util.DialerUtils;
import com.android.dialer.util.IntentUtil;
-import org.lineageos.lib.phone.SensitivePhoneNumbers;
-
/** Helper class to handle all post call actions. */
public class PostCall {
@@ -222,10 +217,6 @@
long callDurationMillis = disconnectTimeMillis - connectTimeMillis;
boolean callDisconnectedByUser = manager.getBoolean(KEY_POST_CALL_DISCONNECT_PRESSED, false);
- String number = manager.getString(KEY_POST_CALL_CALL_NUMBER, null);
-
- boolean isSensitiveNumber = SensitivePhoneNumbers.getInstance().isSensitiveNumber(context,
- number, INVALID_SUBSCRIPTION_ID);
ConfigProvider binding = ConfigProviderComponent.get(context).getConfigProvider();
return disconnectTimeMillis != -1
@@ -235,8 +226,7 @@
&& (connectTimeMillis == 0
|| binding.getLong("postcall_call_duration_threshold", 35_000) > callDurationMillis)
&& getPhoneNumber(context) != null
- && callDisconnectedByUser
- && !isSensitiveNumber;
+ && callDisconnectedByUser;
}
private static boolean shouldPromptUserToViewSentMessage(Context context) {
diff --git a/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java b/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java
index 986ed99..b18df23 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java
@@ -100,7 +100,9 @@
}
private void showVideoAccountSettings() {
- context.startActivity(new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS));
+ Intent intent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(intent);
Toast.makeText(context, "Please enable simulator video provider", Toast.LENGTH_LONG).show();
}
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index d4e7a76..3e94b71 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -139,7 +139,7 @@
LogUtil.enterBlock("SpeedDialFragment.onCreateView");
View rootLayout = inflater.inflate(R.layout.fragment_speed_dial, container, false);
emptyContentView = rootLayout.findViewById(R.id.speed_dial_empty_content_view);
- emptyContentView.setImage(R.drawable.empty_speed_dial);
+ emptyContentView.setImage(R.drawable.oneplus_empty_speed_dial_illustration);
speedDialLoaderListener =
DialerExecutorComponent.get(getContext())
diff --git a/java/com/android/dialer/speeddial/res/drawable-night/oneplus_empty_speed_dial_illustration.png b/java/com/android/dialer/speeddial/res/drawable-night/oneplus_empty_speed_dial_illustration.png
new file mode 100644
index 0000000..cd1297d
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/drawable-night/oneplus_empty_speed_dial_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/speeddial/res/drawable/oneplus_empty_speed_dial_illustration.png b/java/com/android/dialer/speeddial/res/drawable/oneplus_empty_speed_dial_illustration.png
new file mode 100644
index 0000000..f227720
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/drawable/oneplus_empty_speed_dial_illustration.png
Binary files differ
diff --git a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
index 5fecbae..af7dc96 100644
--- a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
+++ b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
@@ -34,6 +34,7 @@
<item name="android:textColorSecondary">@color/settings_text_color_secondary</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="android:colorAccent">?android:attr/colorPrimary</item>
+ <item name="colorPrimary">@color/settings_primary</item>
</style>
<!-- TODO(a bug): This is only actively used in empty_content_view.xml. Move it there. -->
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
index 142bb89..e5f296c 100644
--- a/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
@@ -33,8 +33,8 @@
<!-- Activities and Applications should inherit from one of the themes above. -->
<style name="Dialer.Dark.ThemeBase">
<!-- These values should be used to color all backgrounds. -->
- <item name="android:colorBackground">@color/google_grey_900</item>
- <item name="android:colorBackgroundFloating">@color/google_grey_800</item>
+ <item name="android:colorBackground">@*android:color/system_neutral1_900</item>
+ <item name="android:colorBackgroundFloating">@*android:color/system_neutral1_800</item>
<!-- These values should be used to set text color. -->
<!-- swap text colors. -->
@@ -58,8 +58,8 @@
<!-- Dialer specific attributes. -->
<item name="colorIcon">?android:attr/textColorSecondary</item>
<item name="colorIconSecondary">?android:attr/textColorSecondary</item>
- <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item>
- <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item>
+ <item name="colorTextOnUnthemedDarkBackground">@*android:color/system_neutral1_0</item>
+ <item name="colorIconOnUnthemedDarkBackground">@*android:color/system_neutral1_0</item>
<item name="colorPrimary20pct">@color/dialer_dark_theme_color_20pct</item>
</style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
index 61e0a1b..eb3ee29 100644
--- a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
@@ -47,7 +47,7 @@
<item name="android:forceDarkAllowed">true</item>
<!-- These values should be used to color all backgrounds. -->
<item name="android:colorBackground">@color/dialer_background_color</item>
- <item name="android:colorBackgroundFloating">@android:color/white</item>
+ <item name="android:colorBackgroundFloating">@color/dialer_background_floating</item>
<item name="colorBackgroundSearchBar">@color/dialer_search_bar_color</item>
<!-- These values should be used to set text color. -->
@@ -62,8 +62,8 @@
<item name="colorPrimary">@color/dialer_theme_color</item>
<item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
<item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>
- <item name="android:colorAccent">@color/dialer_secondary_color</item>
- <item name="colorAccent">@color/dialer_secondary_color</item>
+ <item name="android:colorAccent">@color/dialer_theme_color</item>
+ <item name="colorAccent">@color/dialer_theme_color</item>
<!-- Used to automatically style check/selected checkbox, switches and radio buttons -->
<item name="colorControlActivated">?android:attr/colorPrimary</item>
@@ -71,8 +71,8 @@
<!-- Dialer specific attributes. -->
<item name="colorIcon">@color/google_grey_700</item>
<item name="colorIconSecondary">@color/google_grey_400</item>
- <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item>
- <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item>
+ <item name="colorTextOnUnthemedDarkBackground">@*android:color/system_neutral1_0</item>
+ <item name="colorIconOnUnthemedDarkBackground">@*android:color/system_neutral1_0</item>
<item name="colorMobileTerminatingChatText">@color/google_grey_900</item>
<item name="colorMobileTerminatingChatBackground">@color/google_grey_100</item>
<item name="colorMobileOriginatingChatText">@color/google_blue_900</item>
@@ -99,6 +99,6 @@
</style>
<style name="DialerActionBarBaseTheme"
parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
- <item name="colorControlNormal">@android:color/white</item>
+ <item name="colorControlNormal">@*android:color/system_neutral1_0</item>
</style>
</resources>
diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml
index 1831862..9343f1d 100644
--- a/java/com/android/dialer/theme/common/res/values/colors.xml
+++ b/java/com/android/dialer/theme/common/res/values/colors.xml
@@ -16,7 +16,7 @@
-->
<!-- The colors in this file aren't configured at the theme level. -->
<resources>
- <color name="dialer_call_green">#00C853</color>
+ <color name="dialer_call_green">@*android:color/system_accent1_600</color>
<color name="dialer_end_call_button_color">#BD2A2A</color>
<color name="dialer_divider_line_color">#D8D8D8</color>
<color name="dialer_link_color">#2A56C6</color>
diff --git a/java/com/android/dialer/theme/common/res/values/styles.xml b/java/com/android/dialer/theme/common/res/values/styles.xml
index 2c6446c..0a4a6b6 100644
--- a/java/com/android/dialer/theme/common/res/values/styles.xml
+++ b/java/com/android/dialer/theme/common/res/values/styles.xml
@@ -22,8 +22,8 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_margin">4dp</item>
<item name="android:baselineAligned">false</item>
- <item name="cardCornerRadius">2dp</item>
- <item name="cardBackgroundColor">?android:attr/colorBackgroundFloating</item>
+ <item name="cardCornerRadius">12dp</item>
+ <item name="cardBackgroundColor">@color/dialer_background_floating</item>
</style>
<!-- This Checkbox style helps align checkboxes with the common list element layout(Image + text) -->
diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_light.xml
similarity index 62%
rename from java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
rename to java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_light.xml
index 8d04c72..c08664e 100644
--- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
+++ b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_light.xml
@@ -15,10 +15,9 @@
-->
<resources>
<!-- Essential theme colors -->
- <color name="dialer_theme_color">#5195EA</color>
- <color name="dialer_theme_color_20pct">#335195EA</color>
- <color name="dialer_secondary_color">#5195EA</color>
- <color name="dialer_ripple_color">#33ffffff</color>
- <color name="dialer_search_bar_color">@color/google_grey_900</color>
- <color name="settings_primary_dark">#2374CE</color>
+ <color name="dialer_theme_color_dark">@color/dialer_background_color</color>
+ <color name="dialer_background_color">@android:color/system_neutral1_900</color>
+ <color name="dialer_background_floating">@android:color/system_neutral1_800</color>
+ <color name="dialer_search_bar_color">@android:color/system_neutral1_800</color>
+ <color name="rounded_dialpad_bg_color">@android:color/system_neutral1_800</color>
</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
index e4d1e29..1fe0963 100644
--- a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
@@ -15,12 +15,15 @@
-->
<resources>
<!-- Essential theme colors -->
- <color name="dialer_theme_color">#2A56C6</color>
+ <color name="dialer_theme_color">@android:color/system_accent1_600</color>
<color name="dialer_theme_color_20pct">#332A56C6</color>
<color name="dialer_theme_color_dark">@color/dialer_background_color</color>
- <color name="dialer_secondary_color">#F50057</color>
- <color name="dialer_background_color">#FAFAFA</color>
+ <color name="dialer_secondary_color">@android:color/system_accent3_400</color>
+ <color name="dialer_background_color">@android:color/system_neutral1_50</color>
+ <color name="dialer_background_floating">@android:color/system_neutral1_100</color>
<color name="dialer_ripple_color">#1f000000</color>
- <color name="dialer_search_bar_color">@color/google_grey_50</color>
- <color name="settings_primary_dark">#1C3AA9</color>
+ <color name="dialer_search_bar_color">@android:color/system_neutral1_100</color>
+ <color name="settings_primary_dark">@android:color/system_accent1_700</color>
+ <color name="settings_primary">@android:color/system_accent1_600</color>
+ <color name="rounded_dialpad_bg_color">@android:color/system_neutral1_100</color>
</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/styles.xml b/java/com/android/dialer/theme/hidden/res/values/styles.xml
index 44a35f8..dbd9ab9 100644
--- a/java/com/android/dialer/theme/hidden/res/values/styles.xml
+++ b/java/com/android/dialer/theme/hidden/res/values/styles.xml
@@ -52,10 +52,8 @@
activity's theme extends from Dialer.ThemeBase(.NoActionBar) or doesn't specify a theme. -->
<style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
- <!-- TODO(a bug): figure out why ?android:attr/colorPrimary doesn't work here -->
<item name="android:colorAccent">@color/dialer_theme_color</item>
<item name="colorAccent">@color/dialer_theme_color</item>
- <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
<item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
</style>
</resources>
diff --git a/java/com/android/dialer/widget/EmptyContentView.java b/java/com/android/dialer/widget/EmptyContentView.java
index c0f9c9c..7d9c08a 100644
--- a/java/com/android/dialer/widget/EmptyContentView.java
+++ b/java/com/android/dialer/widget/EmptyContentView.java
@@ -66,9 +66,6 @@
descriptionView = (TextView) findViewById(R.id.empty_list_view_message);
actionView = (TextView) findViewById(R.id.empty_list_view_action);
actionView.setOnClickListener(this);
-
- imageView.setImageTintList(
- ColorStateList.valueOf(ThemeComponent.get(context).theme().getColorIconSecondary()));
}
public void setDescription(int resourceId) {
diff --git a/java/com/android/dialer/widget/res/layout/empty_content_view.xml b/java/com/android/dialer/widget/res/layout/empty_content_view.xml
index 57bb2fd..3e8fb31 100644
--- a/java/com/android/dialer/widget/res/layout/empty_content_view.xml
+++ b/java/com/android/dialer/widget/res/layout/empty_content_view.xml
@@ -18,7 +18,7 @@
<ImageView
android:id="@+id/empty_list_view_image"
android:layout_width="match_parent"
- android:layout_height="108dp"
+ android:layout_height="208dp"
android:gravity="center_horizontal"/>
<TextView
diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java
index 0fa833e..fa82973 100644
--- a/java/com/android/incallui/CallButtonPresenter.java
+++ b/java/com/android/incallui/CallButtonPresenter.java
@@ -22,6 +22,7 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Trace;
+import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.support.v4.os.UserManagerCompat;
@@ -74,6 +75,7 @@
private DialerCall call;
private boolean isInCallButtonUiReady;
private PhoneAccountHandle otherAccount;
+ private boolean isRecording = false;
private CallRecorder.RecordingProgressListener recordingProgressListener =
new CallRecorder.RecordingProgressListener() {
@@ -114,6 +116,11 @@
CallRecorder recorder = CallRecorder.getInstance();
recorder.addRecordingProgressListener(recordingProgressListener);
+ if(recorder.isRecording()){
+ inCallButtonUi.setCallRecordingState(true);
+ } else {
+ inCallButtonUi.setCallRecordingState(false);
+ }
// Update the buttons state immediately for the current call
onStateChange(InCallState.NO_CALLS, inCallPresenter.getInCallState(), CallList.getInstance());
@@ -144,6 +151,9 @@
@Override
public void onStateChange(InCallState oldState, InCallState newState, CallList callList) {
Trace.beginSection("CallButtonPresenter.onStateChange");
+ CallRecorder recorder = CallRecorder.getInstance();
+ boolean isEnabled = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.auto_call_recording_key), false);
+
if (call != null) {
call.removeListener(this);
}
@@ -152,6 +162,15 @@
} else if (newState == InCallState.INCALL) {
call = callList.getActiveOrBackgroundCall();
+ if (!isRecording && isEnabled && call != null) {
+ isRecording = true;
+ new Handler().postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ callRecordClicked(true);
+ }
+ }, 500);
+ }
// When connected to voice mail, automatically shows the dialpad.
// (On previous releases we showed it when in-call shows up, before waiting for
// OUTGOING. We may want to do that once we start showing "Voice mail" label on
@@ -167,6 +186,9 @@
}
call = callList.getIncomingCall();
} else {
+ if (isEnabled && recorder.isRecording()) {
+ recorder.finishRecording();
+ }
call = null;
}
@@ -337,21 +359,7 @@
public void callRecordClicked(boolean checked) {
CallRecorder recorder = CallRecorder.getInstance();
if (checked) {
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
- boolean warningPresented = prefs.getBoolean(KEY_RECORDING_WARNING_PRESENTED, false);
- if (!warningPresented) {
- new AlertDialog.Builder(getActivity())
- .setTitle(R.string.recording_warning_title)
- .setMessage(R.string.recording_warning_text)
- .setPositiveButton(R.string.onscreenCallRecordText, (dialog, which) -> {
- prefs.edit()
- .putBoolean(KEY_RECORDING_WARNING_PRESENTED, true)
- .apply();
- startCallRecordingOrAskForPermission();
- })
- .setNegativeButton(android.R.string.cancel, null)
- .show();
- } else {
+ if(!recorder.isRecording()) {
startCallRecordingOrAskForPermission();
}
} else {
diff --git a/java/com/android/incallui/CallerInfoUtils.java b/java/com/android/incallui/CallerInfoUtils.java
index 6f73f2f..38043ed 100644
--- a/java/com/android/incallui/CallerInfoUtils.java
+++ b/java/com/android/incallui/CallerInfoUtils.java
@@ -16,8 +16,6 @@
package com.android.incallui;
-import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
import android.content.Context;
import android.content.Loader;
import android.content.Loader.OnLoadCompleteListener;
@@ -35,8 +33,6 @@
import com.android.incallui.call.DialerCall;
import java.util.Arrays;
-import org.lineageos.lib.phone.SensitivePhoneNumbers;
-
/** Utility methods for contact and caller info related functionality */
public class CallerInfoUtils {
@@ -104,7 +100,6 @@
}
number = modifyForSpecialCnapCases(context, info, number, info.numberPresentation);
}
- number = modifyPossibleSensitiveNumber(context, info, number);
info.phoneNumber = number;
}
@@ -145,19 +140,6 @@
return cacheInfo;
}
- static String modifyPossibleSensitiveNumber(Context context, CallerInfo ci, String number) {
- if (ci == null || number == null) {
- return number;
- }
- boolean isSensitiveNumber = SensitivePhoneNumbers.getInstance().isSensitiveNumber(context,
- number, INVALID_SUBSCRIPTION_ID);
- if (isSensitiveNumber) {
- number = context.getString(R.string.unknown);
- ci.numberPresentation = TelecomManager.PRESENTATION_UNKNOWN;
- }
- return number;
- }
-
/**
* Handles certain "corner cases" for CNAP. When we receive weird phone numbers from the network
* to indicate different number presentations, convert them to expected number and presentation
diff --git a/java/com/android/incallui/DialpadFragment.java b/java/com/android/incallui/DialpadFragment.java
index 2ae2aca..0f8e0c7 100644
--- a/java/com/android/incallui/DialpadFragment.java
+++ b/java/com/android/incallui/DialpadFragment.java
@@ -84,7 +84,6 @@
// KeyListener used with the "dialpad digits" EditText widget.
private DtmfKeyListener dtmfKeyListener;
private DialpadView dialpadView;
- private int currentTextColor;
private View endCallSpace;
private boolean shouldShowEndCallSpace = true;
@@ -142,7 +141,6 @@
final View parent = layoutInflater.inflate(R.layout.incall_dialpad_fragment, container, false);
dialpadView = (DialpadView) parent.findViewById(R.id.dialpad_view);
dialpadView.setCanDigitsBeEdited(false);
- dialpadView.setBackgroundResource(R.color.incall_dialpad_background);
dtmfDialerField = (EditText) parent.findViewById(R.id.digits);
if (dtmfDialerField != null) {
LogUtil.i("DialpadFragment.onCreateView", "creating dtmfKeyListener");
@@ -165,26 +163,9 @@
@Override
public void onResume() {
super.onResume();
- updateColors();
endCallSpace.setVisibility(shouldShowEndCallSpace ? View.VISIBLE : View.GONE);
}
- public void updateColors() {
- int textColor = InCallPresenter.getInstance().getThemeColorManager().getPrimaryColor();
-
- if (currentTextColor == textColor) {
- return;
- }
-
- DialpadKeyButton dialpadKey;
- for (int i = 0; i < buttonIds.length; i++) {
- dialpadKey = (DialpadKeyButton) dialpadView.findViewById(buttonIds[i]);
- ((TextView) dialpadKey.findViewById(R.id.dialpad_key_number)).setTextColor(textColor);
- }
-
- currentTextColor = textColor;
- }
-
@Override
public void onDestroyView() {
dtmfKeyListener = null;
diff --git a/java/com/android/incallui/ThemeColorManager.java b/java/com/android/incallui/ThemeColorManager.java
index 1d4c287..f6b69ce 100644
--- a/java/com/android/incallui/ThemeColorManager.java
+++ b/java/com/android/incallui/ThemeColorManager.java
@@ -81,14 +81,6 @@
backgroundColorMiddle = context.getColor(R.color.incall_background_gradient_middle);
backgroundColorBottom = context.getColor(R.color.incall_background_gradient_bottom);
backgroundColorSolid = context.getColor(R.color.incall_background_multiwindow);
- if (highlightColor != PhoneAccount.NO_HIGHLIGHT_COLOR) {
- // The default background gradient has a subtle alpha. We grab that alpha and apply it to
- // the phone account color.
- backgroundColorTop = applyAlpha(palette.mPrimaryColor, backgroundColorTop);
- backgroundColorMiddle = applyAlpha(palette.mPrimaryColor, backgroundColorMiddle);
- backgroundColorBottom = applyAlpha(palette.mPrimaryColor, backgroundColorBottom);
- backgroundColorSolid = applyAlpha(palette.mPrimaryColor, backgroundColorSolid);
- }
}
primaryColor = palette.mPrimaryColor;
@@ -135,9 +127,4 @@
public int getBackgroundColorSolid() {
return backgroundColorSolid;
}
-
- @ColorInt
- private static int applyAlpha(@ColorInt int color, @ColorInt int sourceColorWithAlpha) {
- return ColorUtils.setAlphaComponent(color, Color.alpha(sourceColorWithAlpha));
- }
}
diff --git a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java
index 8928dd6..fab5a07 100644
--- a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java
+++ b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java
@@ -769,20 +769,30 @@
rejectTextShow.setStartDelay(SWIPE_TO_DECLINE_FADE_IN_DELAY_MILLIS);
// reject hint text translate in
- Animator rejectTextTranslate =
+ Animator rejectTextTranslateIn =
ObjectAnimator.ofFloat(
swipeToRejectText,
View.TRANSLATION_Y,
DpUtil.dpToPx(getContext(), HINT_REJECT_FADE_TRANSLATION_Y_DP),
0f);
- rejectTextTranslate.setInterpolator(new FastOutSlowInInterpolator());
- rejectTextTranslate.setDuration(ANIMATE_DURATION_NORMAL_MILLIS);
+ rejectTextTranslateIn.setInterpolator(new FastOutSlowInInterpolator());
+ rejectTextTranslateIn.setDuration(ANIMATE_DURATION_NORMAL_MILLIS);
// reject hint text fade out
Animator rejectTextHide = ObjectAnimator.ofFloat(swipeToRejectText, View.ALPHA, 0f);
rejectTextHide.setInterpolator(new FastOutLinearInInterpolator());
rejectTextHide.setDuration(ANIMATE_DURATION_SHORT_MILLIS);
+ // reject hint text translate out
+ Animator rejectTextTranslateOut =
+ ObjectAnimator.ofFloat(
+ swipeToRejectText,
+ View.TRANSLATION_Y,
+ 0f,
+ DpUtil.dpToPx(getContext(), HINT_REJECT_FADE_TRANSLATION_Y_DP));
+ rejectTextTranslateOut.setInterpolator(new FastOutSlowInInterpolator());
+ rejectTextTranslateOut.setDuration(ANIMATE_DURATION_NORMAL_MILLIS);
+
Interpolator curve =
PathInterpolatorCompat.create(
0.4f /* controlX1 */, 0 /* controlY1 */, 0 /* controlX2 */, 1 /* controlY2 */);
@@ -817,6 +827,7 @@
breatheAnimation
.play(textUp)
.with(rejectTextHide)
+ .with(rejectTextTranslateOut)
.with(puckUp)
.with(puckScaleUp)
.after(167 /* delay */);
@@ -827,7 +838,7 @@
.with(textDown)
.with(puckScaleDown)
.with(rejectTextShow)
- .with(rejectTextTranslate)
+ .with(rejectTextTranslateIn)
.after(puckUp);
// Add vibration animation to the animator set.
diff --git a/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml b/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml
index 3c9f4bc..772a291 100644
--- a/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml
+++ b/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml
@@ -4,7 +4,7 @@
<item>
<shape
android:shape="oval">
- <solid android:color="#FFDF0000"/>
+ <solid android:color="@*android:color/system_accent3_600"/>
</shape>
</item>
</ripple>
diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java
index 189f6fe..857d3df 100644
--- a/java/com/android/incallui/contactgrid/ContactGridManager.java
+++ b/java/com/android/incallui/contactgrid/ContactGridManager.java
@@ -390,7 +390,7 @@
workIconImageView.setVisibility(info.isWorkIconVisible ? View.VISIBLE : View.GONE);
if (hdIconImageView.getVisibility() == View.GONE) {
if (info.isHdAttemptingIconVisible) {
- hdIconImageView.setImageResource(R.drawable.asd_hd_icon);
+ hdIconImageView.setImageResource(R.drawable.quantum_ic_hd_white_24);
hdIconImageView.setVisibility(View.VISIBLE);
hdIconImageView.setActivated(false);
Drawable drawableCurrent = hdIconImageView.getDrawable().getCurrent();
@@ -398,7 +398,7 @@
((Animatable) drawableCurrent).start();
}
} else if (info.isHdIconVisible) {
- hdIconImageView.setImageResource(R.drawable.asd_hd_icon);
+ hdIconImageView.setImageResource(R.drawable.quantum_ic_hd_white_24);
hdIconImageView.setVisibility(View.VISIBLE);
hdIconImageView.setActivated(true);
}
diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java
index 2ad3d3e..5d1dcc2 100644
--- a/java/com/android/incallui/incall/impl/ButtonController.java
+++ b/java/com/android/incallui/incall/impl/ButtonController.java
@@ -546,7 +546,7 @@
InCallButtonIds.BUTTON_ADD_CALL,
0,
R.string.incall_label_add_call,
- R.drawable.ic_addcall_white);
+ R.drawable.quantum_ic_add_call_white);
Assert.isNotNull(delegate);
}
diff --git a/java/com/android/incallui/incall/impl/res/drawable-mdpi/ic_addcall_white.png b/java/com/android/incallui/incall/impl/res/drawable-mdpi/ic_addcall_white.png
deleted file mode 100644
index a608052..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-mdpi/ic_addcall_white.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xhdpi/ic_addcall_white.png b/java/com/android/incallui/incall/impl/res/drawable-xhdpi/ic_addcall_white.png
deleted file mode 100644
index d2a843c..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xhdpi/ic_addcall_white.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_00.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_00.png
deleted file mode 100644
index 4c8b33f..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_00.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_01.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_01.png
deleted file mode 100644
index 9101779..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_01.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_02.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_02.png
deleted file mode 100644
index 92a27ee..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_02.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_03.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_03.png
deleted file mode 100644
index 484058f..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_03.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_04.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_04.png
deleted file mode 100644
index 348ae92..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_04.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_05.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_05.png
deleted file mode 100644
index 011915a..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_05.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_06.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_06.png
deleted file mode 100644
index c1cc0d6..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_06.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_07.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_07.png
deleted file mode 100644
index 75233db..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_07.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_08.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_08.png
deleted file mode 100644
index 2918e1a..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_08.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_09.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_09.png
deleted file mode 100644
index 7e92767..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_09.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_10.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_10.png
deleted file mode 100644
index 0089314..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_10.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_11.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_11.png
deleted file mode 100644
index f66a6b6..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_11.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_12.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_12.png
deleted file mode 100644
index 9303d95..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_12.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_13.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_13.png
deleted file mode 100644
index d2bef6e..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_13.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_14.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_14.png
deleted file mode 100644
index a5434ec..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_14.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_00.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_00.xml
new file mode 100644
index 0000000..541126d
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_00.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="0.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_01.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_01.xml
new file mode 100644
index 0000000..8f739c4
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_01.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="170.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_02.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_02.xml
new file mode 100644
index 0000000..3a015c8
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_02.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="150.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_03.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_03.xml
new file mode 100644
index 0000000..84396a5
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_03.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="135.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_04.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_04.xml
new file mode 100644
index 0000000..3e4a397
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_04.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="115.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_05.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_05.xml
new file mode 100644
index 0000000..a82ebe6
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_05.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="100.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_06.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_06.xml
new file mode 100644
index 0000000..d43f036
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_06.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="85.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_07.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_07.xml
new file mode 100644
index 0000000..a731990
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_07.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="70.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_08.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_08.xml
new file mode 100644
index 0000000..3097146
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_08.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="55.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_09.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_09.xml
new file mode 100644
index 0000000..727c460
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_09.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="45.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_10.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_10.xml
new file mode 100644
index 0000000..9b9fd51
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="35.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_11.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_11.xml
new file mode 100644
index 0000000..4f16c60
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_11.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="20.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_12.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_12.xml
new file mode 100644
index 0000000..13e5323
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_12.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="10.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_13.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_13.xml
new file mode 100644
index 0000000..7f6e55f
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_13.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="5.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_14.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_14.xml
new file mode 100644
index 0000000..a0639df
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_vd_theme_24_14.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:tint="?colorControlNormal" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:pivotX="12.0" android:pivotY="12.5" android:rotation="2.0">
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_arrows" />
+ </group>
+ <path android:fillColor="@android:color/white" android:pathData="@string/comms_gm_sim_change_path_sim" />
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_white.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_white.xml
index 00b1b7a..299f58f 100644
--- a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_white.xml
+++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_white.xml
@@ -1,68 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/ic_sim_change_white"
- android:oneshot="true">
- <item
- android:drawable="@drawable/ic_sim_change_white_00"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_01"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_02"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_03"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_04"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_05"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_06"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_07"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_08"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_09"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_10"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_11"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_12"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_13"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_14"
- android:duration="33"/>
- <item
- android:drawable="@drawable/ic_sim_change_white_00"
- android:duration="33"/>
-</animation-list>
\ No newline at end of file
+<animation-list android:oneshot="true"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_00" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_01" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_02" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_03" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_04" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_05" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_06" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_07" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_08" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_09" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_10" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_11" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_12" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_13" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_14" />
+ <item android:duration="33" android:drawable="@drawable/ic_sim_change_vd_theme_24_00" />
+</animation-list>
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 9cc599d..45870f3 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
@@ -113,7 +113,7 @@
<ImageButton
android:id="@+id/incall_end_call"
style="@style/Incall.Button.End"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="36dp"
android:layout_marginBottom="36dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
diff --git a/java/com/android/incallui/incall/impl/res/values/strings.xml b/java/com/android/incallui/incall/impl/res/values/strings.xml
index c4c40a1..a26872a 100644
--- a/java/com/android/incallui/incall/impl/res/values/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values/strings.xml
@@ -73,4 +73,8 @@
[CHAR LIMIT=32] -->
<string name="incall_note_sent">Note sent</string>
+ <string name="comms_gm_sim_change_path_arrows">M11.7,16.8c-2.2-0.2-4-2-4-4.3c0-0.8,0.2-1.6,0.7-2.3l0.2-0.3L9.7,11l-0.1,0.2c-0.2,0.4-0.3,0.8-0.3,1.3c0,1.4,1.1,2.5,2.4,2.7v-1.9l2.7,2.7l-2.7,2.7V16.8z M14.3,14l0.1-0.2c0.2-0.4,0.3-0.8,0.3-1.3c0-1.4-1.1-2.5-2.4-2.7v1.9L9.6,9l2.7-2.7v1.9c2.2,0.2,4,2,4,4.3c0,0.8-0.2,1.6-0.7,2.3l-0.2,0.3L14.3,14z</string>
+
+ <string name="comms_gm_sim_change_path_sim">M18,2h-8L4,8v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V4C19.9,2.9,19,2,18,2z M18,4v16H6V8.8L10.8,4H18z</string>
+
</resources>
diff --git a/java/com/android/incallui/res/drawable/ic_hd_call.xml b/java/com/android/incallui/res/drawable/ic_hd_call.xml
index b887d3f..aad4e24 100644
--- a/java/com/android/incallui/res/drawable/ic_hd_call.xml
+++ b/java/com/android/incallui/res/drawable/ic_hd_call.xml
@@ -15,21 +15,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-
-<!-- This is came from Motorola which is requested by Sprint for HD call. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:width="24dp">
-
- <path
- android:fillColor="#fff"
- android:pathData="M4.54,12.9A14.83,14.83 0,0 0,11 19.35l2.15,-2.15a1,1 0,0 1,1 -0.23,11.17 11.17,0 0,0 3.5,0.56 1,1 0,0 1,1 1v3.42a1,1 0,0 1,-1 1A16.64,16.64 0,0 1,1 6.25a1,1 0,0 1,1 -1H5.41a1,1 0,0 1,1 1,11.12 11.12,0 0,0 0.56,3.5 1,1 0,0 1,-0.24 1Z"/>
- <path
- android:fillColor="#fff"
- android:pathData="M15.38,12.67H14.22V8.44H10.54v4.23H9.38V3.51h1.15V7.45h3.69V3.51h1.16Z"/>
- <path
- android:fillColor="#fff"
- android:pathData="M17.37,12.67V3.51h2.18a3.15,3.15 0,0 1,2.49 1,4.12 4.12,0 0,1 0.89,2.82V8.87a4,4 0,0 1,-0.9 2.81,3.35 3.35,0 0,1 -2.61,1ZM18.52,4.5v7.18h0.92a2.14,2.14 0,0 0,1.77 -0.7,3.28 3.28,0 0,0 0.57,-2.06V7.3a3.32,3.32 0,0 0,-0.56 -2.12,2.05 2.05,0 0,0 -1.68,-0.68Z"/>
-</vector>
\ No newline at end of file
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM7.5,13h2v2L11,15L11,9L9.5,9v2.5h-2L7.5,9L6,9v6h1.5zM18,14v-4c0,-0.55 -0.45,-1 -1,-1h-4v6h4c0.55,0 1,-0.45 1,-1zM16.5,13.5h-2v-3h2v3z"/>
+</vector>
diff --git a/java/com/android/incallui/theme/res/values/colors.xml b/java/com/android/incallui/theme/res/values/colors.xml
index 059fe59..0ed34ff 100644
--- a/java/com/android/incallui/theme/res/values/colors.xml
+++ b/java/com/android/incallui/theme/res/values/colors.xml
@@ -20,8 +20,6 @@
<!-- Used with some smaller texts in manage conference screen. -->
<color name="conference_call_manager_secondary_text_color">#999999</color>
- <color name="incall_dialpad_background">#ffffff</color>
-
<!-- Background color for status bar. For portrait this will be ignored. -->
<color name="statusbar_background_color">?android:attr/colorPrimary</color>
@@ -53,11 +51,11 @@
<item>#841F10</item>
</array>
- <color name="incall_background_gradient_top">#E91141BB</color>
- <color name="incall_background_gradient_middle">#E91141BB</color>
- <color name="incall_background_gradient_bottom">#CC229FEB</color>
+ <color name="incall_background_gradient_top">@*android:color/system_accent1_600</color>
+ <color name="incall_background_gradient_middle">@*android:color/system_accent1_500</color>
+ <color name="incall_background_gradient_bottom">@*android:color/system_accent1_400</color>
- <color name="incall_background_multiwindow">#E91141BB</color>
+ <color name="incall_background_multiwindow">@*android:color/system_accent1_500</color>
<color name="incall_background_gradient_spam_top">#E5A30B0B</color>
<color name="incall_background_gradient_spam_middle">#D6C01111</color>
diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
index 5b65cc3..1489ae8 100644
--- a/java/com/android/incallui/theme/res/values/styles.xml
+++ b/java/com/android/incallui/theme/res/values/styles.xml
@@ -24,11 +24,8 @@
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
-
- <item name="dialpad_key_button_touch_tint">?attr/colorPrimary20pct</item>
<item name="dialpad_style">@style/InCallDialpad</item>
<item name="android:windowAnimationStyle">@null</item>
-
<item name="android:windowBackground">@drawable/incall_background_gradient</item>
<item name="android:windowShowWallpaper">true</item>
</style>
@@ -41,11 +38,8 @@
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
<item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>
-
- <item name="dialpad_key_button_touch_tint">?attr/colorPrimary20pct</item>
<item name="dialpad_style">@style/InCallDialpad</item>
<item name="android:windowAnimationStyle">@null</item>
-
<item name="android:windowBackground">@drawable/incall_background_gradient</item>
<item name="android:windowShowWallpaper">true</item>
</style>
