From c6deafc10cd005ba046f3d87693012c6b81e0bc4 Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Mon, 6 Nov 2017 16:42:13 -0800
Subject: Rename value name to avoid conflict.

Test: None
PiperOrigin-RevId: 174782468
Change-Id: Iaf842b35f6f5fa4ac0e1505ce39e7470fb23b51d
---
 java/com/android/newbubble/NewBubble.java        | 4 +++-
 java/com/android/newbubble/res/values/values.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'java/com/android')

diff --git a/java/com/android/newbubble/NewBubble.java b/java/com/android/newbubble/NewBubble.java
index fb6a5e458..e690f4be4 100644
--- a/java/com/android/newbubble/NewBubble.java
+++ b/java/com/android/newbubble/NewBubble.java
@@ -475,7 +475,9 @@ public class NewBubble {
         .getPrimaryButton()
         .animate()
         .translationZ(
-            context.getResources().getDimensionPixelOffset(R.dimen.bubble_move_elevation_change));
+            context
+                .getResources()
+                .getDimensionPixelOffset(R.dimen.bubble_dragging_elevation_change));
   }
 
   void onMoveFinish() {
diff --git a/java/com/android/newbubble/res/values/values.xml b/java/com/android/newbubble/res/values/values.xml
index d8cd08f87..a028254c7 100644
--- a/java/com/android/newbubble/res/values/values.xml
+++ b/java/com/android/newbubble/res/values/values.xml
@@ -18,7 +18,7 @@
 <resources>
   <dimen name="bubble_size">56dp</dimen>
   <dimen name="bubble_icon_padding">16dp</dimen>
-  <dimen name="bubble_move_elevation_change">6dp</dimen>
+  <dimen name="bubble_dragging_elevation_change">6dp</dimen>
 
   <dimen name="bubble_button_height">36dp</dimen>
   <dimen name="bubble_button_icon_padding">16dp</dimen>
-- 
cgit v1.2.3