commit c6deafc10cd005ba046f3d87693012c6b81e0bc4
author yueg <yueg@google.com> Mon Nov 06 16:42:13 2017 -0800
committer Zachary Heidepriem <zachh@google.com> Sat Nov 11 12:16:41 2017 -0800
tree 4cc0c61bbf593c9d88f064ba7fe36de270ccb733
parent c950a9b832540d643e2309df6b9413f0b07444ac

Rename value name to avoid conflict.

Test: None
PiperOrigin-RevId: 174782468
Change-Id: Iaf842b35f6f5fa4ac0e1505ce39e7470fb23b51d

java/com/android/newbubble/NewBubble.java

diff --git a/java/com/android/newbubble/NewBubble.java b/java/com/android/newbubble/NewBubble.java
index fb6a5e4..e690f4b 100644
--- a/java/com/android/newbubble/NewBubble.java
+++ b/java/com/android/newbubble/NewBubble.java
@@ -475,7 +475,9 @@
         .getPrimaryButton()
         .animate()
         .translationZ(
-            context.getResources().getDimensionPixelOffset(R.dimen.bubble_move_elevation_change));
+            context
+                .getResources()
+                .getDimensionPixelOffset(R.dimen.bubble_dragging_elevation_change));
   }
 
   void onMoveFinish() {

java/com/android/newbubble/res/values/values.xml

diff --git a/java/com/android/newbubble/res/values/values.xml b/java/com/android/newbubble/res/values/values.xml
index d8cd08f..a028254 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>