Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." (5da5438e) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContentResolver.java

+113 −9

Original line number	Diff line number	Diff line
		@@ -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,109 @@ 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 String[] getStreamTypes(Uri arg0, String arg1) throws RemoteException {
		// TODO Auto-generated method stub
		return null;
		}

		public AssetFileDescriptor openTypedAssetFile(Uri arg0, String arg1, Bundle arg2)
		throws RemoteException, FileNotFoundException {
		// 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

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -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

tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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();