diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
| commit | 1a76449a643ab1e544da54514cf09f6f17f4d075 (patch) | |
| tree | 2615a977c52d7a479001ed451a58aa484dbe75e0 /photoviewer/sample/src/com/example/photoviewersample/MainActivity.java | |
| parent | 9f1ab148925b098cec90d06992ade0fca2889a14 (diff) | |
| parent | e032f315b6f95896ff471e92a20a42159d53fa6a (diff) | |
| download | android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.gz android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.bz2 android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.zip | |
Merge branch 'goog/jb-ub-mail-ur8' into master
Conflicts:
photoviewer/AndroidManifest.xml
photoviewer/res/values/dimen.xml
photoviewer/src/com/android/ex/photo/Intents.java
photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
photoviewer/src/com/android/ex/photo/util/ImageUtils.java
photoviewer/src/com/android/ex/photo/views/PhotoView.java
Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
Diffstat (limited to 'photoviewer/sample/src/com/example/photoviewersample/MainActivity.java')
| -rw-r--r-- | photoviewer/sample/src/com/example/photoviewersample/MainActivity.java | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/photoviewer/sample/src/com/example/photoviewersample/MainActivity.java b/photoviewer/sample/src/com/example/photoviewersample/MainActivity.java deleted file mode 100644 index efc2064..0000000 --- a/photoviewer/sample/src/com/example/photoviewersample/MainActivity.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.example.photoviewersample; - -import android.app.Activity; -import android.os.Bundle; -import android.view.View; -import android.view.View.OnClickListener; - -import com.android.ex.photo.Intents; -import com.android.ex.photo.Intents.PhotoViewIntentBuilder; - -public class MainActivity extends Activity implements OnClickListener { - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - View b = findViewById(R.id.button); - b.setOnClickListener(this); - } - - @Override - public void onClick(View v) { - final PhotoViewIntentBuilder builder = - Intents.newPhotoViewActivityIntentBuilder(this); - builder - .setPhotosUri("content://com.example.photoviewersample.SampleProvider/photos"); - - startActivity(builder.build()); - } -} |