diff options
author | Xavier Ducrohet <xav@android.com> | 2010-10-26 12:13:32 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 12:13:32 -0700 |
commit | 68404a0125999ebe0d58c3eb1845b3c9aaf4d51e (patch) | |
tree | 78fa4511887e235982fd70dfa9d089235e4fa937 /tools | |
parent | ee1dc6221fc9193fb135386244e61e557a07260d (diff) | |
parent | a44a5e02d21505a9c891a31a34c83761600024c0 (diff) | |
download | frameworks_base-68404a0125999ebe0d58c3eb1845b3c9aaf4d51e.zip frameworks_base-68404a0125999ebe0d58c3eb1845b3c9aaf4d51e.tar.gz frameworks_base-68404a0125999ebe0d58c3eb1845b3c9aaf4d51e.tar.bz2 |
am a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Diffstat (limited to 'tools')
3 files changed, 104 insertions, 11 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContentResolver.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContentResolver.java index d89dba9..20ccc0b 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContentResolver.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContentResolver.java @@ -16,12 +16,27 @@ package com.android.layoutlib.bridge; +import android.content.ContentProviderOperation; +import android.content.ContentProviderResult; import android.content.ContentResolver; +import android.content.ContentValues; import android.content.Context; import android.content.IContentProvider; +import android.content.OperationApplicationException; +import android.content.res.AssetFileDescriptor; import android.database.ContentObserver; +import android.database.Cursor; +import android.database.CursorWindow; +import android.database.IBulkCursor; +import android.database.IContentObserver; import android.net.Uri; import android.os.Bundle; +import android.os.IBinder; +import android.os.ParcelFileDescriptor; +import android.os.RemoteException; + +import java.io.FileNotFoundException; +import java.util.ArrayList; /** * A mock content resolver for the LayoutLib Bridge. @@ -32,20 +47,98 @@ import android.os.Bundle; */ public class BridgeContentResolver extends ContentResolver { + private BridgeContentProvider mProvider = null; + + public static final class BridgeContentProvider implements IContentProvider { + + public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> arg0) + throws RemoteException, OperationApplicationException { + // TODO Auto-generated method stub + return null; + } + + public int bulkInsert(Uri arg0, ContentValues[] arg1) throws RemoteException { + // TODO Auto-generated method stub + return 0; + } + + public IBulkCursor bulkQuery(Uri arg0, String[] arg1, String arg2, String[] arg3, + String arg4, IContentObserver arg5, CursorWindow arg6) throws RemoteException { + // TODO Auto-generated method stub + return null; + } + + public Bundle call(String arg0, String arg1, Bundle arg2) throws RemoteException { + // TODO Auto-generated method stub + return null; + } + + public int delete(Uri arg0, String arg1, String[] arg2) throws RemoteException { + // TODO Auto-generated method stub + return 0; + } + + public String getType(Uri arg0) throws RemoteException { + // TODO Auto-generated method stub + return null; + } + + public Uri insert(Uri arg0, ContentValues arg1) throws RemoteException { + // TODO Auto-generated method stub + return null; + } + + public AssetFileDescriptor openAssetFile(Uri arg0, String arg1) throws RemoteException, + FileNotFoundException { + // TODO Auto-generated method stub + return null; + } + + public ParcelFileDescriptor openFile(Uri arg0, String arg1) throws RemoteException, + FileNotFoundException { + // TODO Auto-generated method stub + return null; + } + + public Cursor query(Uri arg0, String[] arg1, String arg2, String[] arg3, String arg4) + throws RemoteException { + // TODO Auto-generated method stub + return null; + } + + public int update(Uri arg0, ContentValues arg1, String arg2, String[] arg3) + throws RemoteException { + // TODO Auto-generated method stub + return 0; + } + + public IBinder asBinder() { + // TODO Auto-generated method stub + return null; + } + + } + public BridgeContentResolver(Context context) { super(context); } @Override public IContentProvider acquireProvider(Context c, String name) { - // ignore - return null; + if (mProvider == null) { + mProvider = new BridgeContentProvider(); + } + + return mProvider; } @Override public IContentProvider acquireExistingProvider(Context c, String name) { - // ignore - return null; + if (mProvider == null) { + mProvider = new BridgeContentProvider(); + } + + return mProvider; } @Override @@ -53,7 +146,7 @@ public class BridgeContentResolver extends ContentResolver { // ignore return false; } - + /** * Stub for the layoutlib bridge content resolver. */ @@ -62,7 +155,7 @@ public class BridgeContentResolver extends ContentResolver { ContentObserver observer) { // pass } - + /** * Stub for the layoutlib bridge content resolver. */ @@ -70,7 +163,7 @@ public class BridgeContentResolver extends ContentResolver { public void unregisterContentObserver(ContentObserver observer) { // pass } - + /** * Stub for the layoutlib bridge content resolver. */ @@ -78,7 +171,7 @@ public class BridgeContentResolver extends ContentResolver { public void notifyChange(Uri uri, ContentObserver observer, boolean syncToNetwork) { // pass } - + /** * Stub for the layoutlib bridge content resolver. */ @@ -86,7 +179,7 @@ public class BridgeContentResolver extends ContentResolver { public void startSync(Uri uri, Bundle extras) { // pass } - + /** * Stub for the layoutlib bridge content resolver. */ diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java index f501459..106d7ed 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java @@ -998,8 +998,7 @@ public final class BridgeContext extends Context { @Override public ApplicationInfo getApplicationInfo() { - // TODO Auto-generated method stub - return null; + return new ApplicationInfo(); } @Override diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java index 4adaff9..43f2971 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java @@ -83,6 +83,7 @@ public class Main { "com.android.internal.R**", "android.pim.*", // for datepicker "android.os.*", // for android.os.Handler + "android.database.ContentObserver", // for Digital clock }); aa.analyze(); agen.generate(); |