diff options
Diffstat (limited to 'java/com/android/incallui/calllocation/impl')
3 files changed, 24 insertions, 6 deletions
diff --git a/java/com/android/incallui/calllocation/impl/LocationFragment.java b/java/com/android/incallui/calllocation/impl/LocationFragment.java index c0592b64a..77e4f7f7d 100644 --- a/java/com/android/incallui/calllocation/impl/LocationFragment.java +++ b/java/com/android/incallui/calllocation/impl/LocationFragment.java @@ -88,6 +88,7 @@ public class LocationFragment extends BaseFragment<LocationPresenter, LocationPr @Override public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + LogUtil.enterBlock("LocationFragment.onCreateView"); final View view = inflater.inflate(R.layout.location_fragment, container, false); viewAnimator = (ViewAnimator) view.findViewById(R.id.location_view_animator); locationMap = (ImageView) view.findViewById(R.id.location_map); @@ -95,11 +96,6 @@ public class LocationFragment extends BaseFragment<LocationPresenter, LocationPr addressLine2 = (TextView) view.findViewById(R.id.address_line_two); latLongLine = (TextView) view.findViewById(R.id.lat_long_line); locationLayout = (ViewGroup) view.findViewById(R.id.location_layout); - view.setOnClickListener( - v -> { - LogUtil.enterBlock("LocationFragment.onCreateView"); - launchMap(); - }); return view; } @@ -180,6 +176,7 @@ public class LocationFragment extends BaseFragment<LocationPresenter, LocationPr handler.removeCallbacks(dataTimeoutRunnable); if (viewAnimator.getDisplayedChild() != LOCATION_VIEW_INDEX) { viewAnimator.setDisplayedChild(LOCATION_VIEW_INDEX); + viewAnimator.setOnClickListener(v -> launchMap()); } } diff --git a/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml b/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml new file mode 100644 index 000000000..0bcba95f2 --- /dev/null +++ b/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml @@ -0,0 +1,21 @@ +<?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 + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/ripple_material_light"> + <item android:drawable="@android:color/white"/> +</ripple> diff --git a/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml b/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml index a6bd07542..53188eb19 100644 --- a/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml +++ b/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:background="@android:color/white" + android:background="@drawable/bg_location_card" android:elevation="2dp" android:inAnimation="@android:anim/fade_in" android:measureAllChildren="true" |