Refactor. Merge SelectionDrawer with SlotRenderer.

Change-Id: Iaa50b2a78beb95fc83208a5f74cf612650cd8643

1 files changed, 9 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/data/Path.java b/src/com/android/gallery3d/data/Path.java
index a09df10ad..dfb91315e 100644
--- a/src/com/android/gallery3d/data/Path.java
+++ b/src/com/android/gallery3d/data/Path.java
@@ -175,13 +175,20 @@ public class Path {
     }
 
     public String getPrefix() {
+        if (this == sRoot) return "";
+        return getPrefixPath().mSegment;
+    }
+
+    public Path getPrefixPath() {
         synchronized (Path.class) {
             Path current = this;
-            if (current == sRoot) return "";
+            if (current == sRoot) {
+                throw new IllegalStateException();
+            }
             while (current.mParent != sRoot) {
                 current = current.mParent;
             }
-            return current.mSegment;
+            return current;
         }
     }