diff options
author | calderwoodra <calderwoodra@google.com> | 2018-05-19 00:05:02 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-21 13:17:30 -0700 |
commit | 929539eb864822d669265b142bdcc49b6cf8ea6b (patch) | |
tree | fcaef3fac4068e3669ca5916f7a743d0d5e41bbb /java/com/android/dialer/searchfragment | |
parent | ea7399a7c0c8a3832a6592aee0a0372c300b11f5 (diff) |
Implement a global theme to be easily configured in Dialer.
deleted several colors and unified them across the app
migrated several alert dialogs to support alert dialogs
added many todos
migrated several tests from GoogleRobolectricTestRunner to RobolectricTestRunner
Because of the test migration:
- moved dialpad theme attributes into dialpad/theme
- moved incall ui theme attributes into incallui/theme
Bug: 79883035
Test: tap
PiperOrigin-RevId: 197246477
Change-Id: Ifc534793bc32757bbbf2007a7c40287c8d0817ad
Diffstat (limited to 'java/com/android/dialer/searchfragment')
5 files changed, 8 insertions, 8 deletions
diff --git a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml index a0d9dd274..fb6f66c39 100644 --- a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml +++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical|start" android:fontFamily="sans-serif" - style="@style/PrimaryText"/> + style="@style/Dialer.TextAppearance.Primary"/> <com.android.dialer.widget.BidiTextView android:id="@+id/secondary" @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical|start" android:fontFamily="sans-serif" - style="@style/SecondaryText"/> + style="@style/Dialer.TextAppearance.Secondary"/> </LinearLayout> <ImageView diff --git a/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml index cde9cb6a5..ad6151bbe 100644 --- a/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml +++ b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml @@ -23,12 +23,12 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_light"/> + android:background="?android:attr/colorBackgroundFloating"/> <com.android.dialer.widget.EmptyContentView android:id="@+id/empty_view" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" - android:background="@color/background_dialer_light"/> + android:background="?android:attr/colorBackgroundFloating"/> </FrameLayout> diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml index 6eb1d2e40..b22ddd9a0 100644 --- a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml +++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml @@ -27,5 +27,5 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - style="@style/SecondaryText"/> + style="@style/Dialer.TextAppearance.Secondary"/> </FrameLayout> diff --git a/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml index 8b366fe8a..b6e304807 100644 --- a/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml +++ b/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml @@ -26,7 +26,7 @@ android:layout_marginStart="8dp" android:layout_gravity="center_vertical|start" android:padding="12dp" - android:tint="@color/dialer_theme_color"/> + android:tint="?android:attr/colorPrimary"/> <TextView android:id="@+id/search_action_text" @@ -35,5 +35,5 @@ android:layout_marginStart="72dp" android:layout_marginEnd="16dp" android:layout_gravity="center_vertical" - style="@style/PrimaryText"/> + style="@style/Dialer.TextAppearance.Primary"/> </FrameLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml index 4373252bd..a79e5883c 100644 --- a/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml +++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml @@ -72,7 +72,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:text="@string/nearby_places_dismiss" - android:textColor="@color/dialer_theme_color" + android:textColor="?android:attr/colorPrimary" style="@style/Widget.AppCompat.Button.Borderless"/> </RelativeLayout> </android.support.v7.widget.CardView>
\ No newline at end of file |