From 13221d724c9f26b8ff94c38d0911bbdcabdcb169 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Wed, 20 Sep 2017 16:08:29 -0700
Subject: Added dismiss button to location permission request.

This change adds a dismiss button to the location permission prompt shown in
the search UI. A few other minor changes:
 - Permission prompt is always the first element in the list
 - Adjusted a few dimensions and strings

screenshot: http://screen/9CkRPUQ5dwh
Bug: 65858857
Test: SAT, NSFT
PiperOrigin-RevId: 169466585
Change-Id: I8177c23fe3f635fec5fdcdbe6675428cebb19f5d
---
 .../res/layout/location_permission_row.xml         | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'java/com/android/dialer/searchfragment/nearbyplaces/res/layout')

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 800bf62a8..4204a4f1f 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
@@ -19,12 +19,13 @@
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
-    android:paddingTop="16dp">
+    android:paddingTop="16dp"
+    android:paddingBottom="8dp">
 
   <ImageView
       android:id="@+id/permission_image"
-      android:layout_width="56dp"
-      android:layout_height="56dp"
+      android:layout_width="40dp"
+      android:layout_height="40dp"
       android:layout_marginEnd="16dp"
       android:src="@drawable/quantum_ic_my_location_vd_theme_24"
       android:tint="@color/dialer_secondary_text_color"/>
@@ -34,8 +35,9 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_toEndOf="@id/permission_image"
-      android:minHeight="56dp"
-      android:text="@string/permission_no_location_for_search"
+      android:minHeight="40dp"
+      android:text="@string/search_location_permission"
+      android:lineSpacingMultiplier="1.2"
       android:textSize="16sp"
       android:textColor="@color/dialer_secondary_text_color"/>
 
@@ -45,7 +47,18 @@
       android:layout_height="wrap_content"
       android:layout_alignParentEnd="true"
       android:layout_below="@id/permission_text"
-      android:text="@string/nearby_places_allow"
+      android:layout_marginTop="24dp"
+      android:text="@string/nearby_places_allow"/>
+
+  <Button
+      android:id="@+id/location_permission_dismiss"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_toStartOf="@+id/location_permission_allow"
+      android:layout_below="@id/permission_text"
+      android:layout_marginEnd="16dp"
+      android:layout_marginTop="24dp"
+      android:text="@string/nearby_places_dismiss"
       android:textColor="@color/dialer_theme_color"
       style="@style/Widget.AppCompat.Button.Borderless"/>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3