diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-01-13 10:22:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-13 10:22:53 -0800 |
| commit | 1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f (patch) | |
| tree | b218565d0b9b933288a884131d9ac32ef23cc456 | |
| parent | 66a95e4dbeb1c6d33ceb7c320033041e7f8e2aaa (diff) | |
| parent | ee592fe4e60e940599fc1ccf43a98eb80961feb8 (diff) | |
| download | frameworks_base-1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f.zip frameworks_base-1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f.tar.gz frameworks_base-1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f.tar.bz2 | |
Merge "LayoutLib: move MockView back into its original package." into honeycomb
| -rw-r--r-- | tools/layoutlib/bridge/src/android/view/SurfaceView.java | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/android/webkit/WebView.java | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java (renamed from tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/MockView.java) | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/google/android/maps/MapView.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/SurfaceView.java b/tools/layoutlib/bridge/src/android/view/SurfaceView.java index f7db98a..ce32da9 100644 --- a/tools/layoutlib/bridge/src/android/view/SurfaceView.java +++ b/tools/layoutlib/bridge/src/android/view/SurfaceView.java @@ -16,7 +16,7 @@ package android.view; -import com.android.layoutlib.bridge.android.MockView; +import com.android.layoutlib.bridge.MockView; import android.content.Context; import android.graphics.Canvas; diff --git a/tools/layoutlib/bridge/src/android/webkit/WebView.java b/tools/layoutlib/bridge/src/android/webkit/WebView.java index a20a9d1..3b66188 100644 --- a/tools/layoutlib/bridge/src/android/webkit/WebView.java +++ b/tools/layoutlib/bridge/src/android/webkit/WebView.java @@ -16,7 +16,7 @@ package android.webkit; -import com.android.layoutlib.bridge.android.MockView; +import com.android.layoutlib.bridge.MockView; import android.content.Context; import android.graphics.Bitmap; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/MockView.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java index e5bddcb..1ca3182 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/MockView.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/MockView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.layoutlib.bridge.android; +package com.android.layoutlib.bridge; import android.content.Context; import android.graphics.Canvas; diff --git a/tools/layoutlib/bridge/src/com/google/android/maps/MapView.java b/tools/layoutlib/bridge/src/com/google/android/maps/MapView.java index 1ec6262..6d013bb 100644 --- a/tools/layoutlib/bridge/src/com/google/android/maps/MapView.java +++ b/tools/layoutlib/bridge/src/com/google/android/maps/MapView.java @@ -16,7 +16,7 @@ package com.google.android.maps; -import com.android.layoutlib.bridge.android.MockView; +import com.android.layoutlib.bridge.MockView; import android.content.Context; import android.os.Bundle; |