Auto-update

Author: google-automerger

PdfRendererBasicSample/build.gradle Application/build.gradle

@@ -1,6 +1,3 @@
-
-
-
 buildscript {
     repositories {
         mavenCentral()
@@ -11,13 +8,14 @@ buildscript {
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 
 dependencies {
 
-    compile "com.android.support:support-v4:20.+"
-    compile "com.android.support:support-v13:20.+"
+    compile "com.android.support:support-v4:21.+"
+    compile "com.android.support:support-v13:21.+"
+    compile "com.android.support:cardview-v7:21.+"
 
 }
 
@@ -30,9 +28,13 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion "android-L"
+    compileSdkVersion 21
+    buildToolsVersion "21.0.0"
 
-    buildToolsVersion "20.0.0"
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 21
+    }
 
     sourceSets {
         main {

PdfRendererBasicSample/src/main/AndroidManifest.xml Application/src/main/AndroidManifest.xml

@@ -20,8 +20,6 @@
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="L" android:targetSdkVersion="L" />
-
     <application android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"

PdfRendererBasicSample/src/main/assets/sample.pdf Application/src/main/assets/sample.pdf

@@ -24,13 +24,16 @@
 
 public class MainActivity extends Activity {
 
+    public static final String FRAGMENT_PDF_RENDERER_BASIC = "pdf_renderer_basic";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main_real);
         if (savedInstanceState == null) {
             getFragmentManager().beginTransaction()
-                    .add(R.id.container, new PdfRendererBasicFragment())
+                    .add(R.id.container, new PdfRendererBasicFragment(),
+                            FRAGMENT_PDF_RENDERER_BASIC)
                     .commit();
         }
     }

PdfRendererBasicSample/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java Application/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java

@@ -193,6 +193,15 @@ private void updateUi() {
         getActivity().setTitle(getString(R.string.app_name_with_index, index + 1, pageCount));
     }
 
+    /**
+     * Gets the number of pages in the PDF. This method is marked as public for testing.
+     *
+     * @return The number of pages.
+     */
+    public int getPageCount() {
+        return mPdfRenderer.getPageCount();
+    }
+
     @Override
     public void onClick(View view) {
         switch (view.getId()) {

PdfRendererBasicSample/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java Application/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java

@@ -14,9 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <resources>
     <string name="app_name">PdfRendererBasic</string>
     <string name="intro_message">

PdfRendererBasicSample/src/main/res/drawable-hdpi/ic_action_info.png Application/src/main/res/drawable-hdpi/ic_action_info.png

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
+<manifest
+    package="com.example.android.pdfrendererbasic.tests"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
+
+    <!-- We add an application tag here just so that we can indicate that
+         this package needs to link against the android.test library,
+         which is needed when building test cases. -->
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <!--
+    Specifies the instrumentation test runner used to run the tests.
+    -->
+    <instrumentation
+        android:name="android.test.InstrumentationTestRunner"
+        android:label="Tests for com.example.android.pdfrendererbasic"
+        android:targetPackage="com.example.android.pdfrendererbasic"/>
+
+</manifest>

PdfRendererBasicSample/src/main/res/drawable-hdpi/ic_launcher.png Application/src/main/res/drawable-hdpi/ic_launcher.png

@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.pdfrendererbasic.tests;
+
+import android.content.pm.ActivityInfo;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.TouchUtils;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.view.View;
+import android.widget.Button;
+
+import com.example.android.pdfrendererbasic.MainActivity;
+import com.example.android.pdfrendererbasic.PdfRendererBasicFragment;
+import com.example.android.pdfrendererbasic.R;
+
+/**
+ * Tests for PdfRendererBasic sample.
+ */
+public class PdfRendererBasicFragmentTests extends ActivityInstrumentationTestCase2<MainActivity> {
+
+    private MainActivity mActivity;
+    private PdfRendererBasicFragment mFragment;
+
+    private Button mButtonPrevious;
+    private Button mButtonNext;
+
+    public PdfRendererBasicFragmentTests() {
+        super(MainActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mActivity = getActivity();
+        mFragment = (PdfRendererBasicFragment) mActivity.getFragmentManager()
+                .findFragmentByTag(MainActivity.FRAGMENT_PDF_RENDERER_BASIC);
+    }
+
+    @LargeTest
+    public void testActivityTitle() {
+        // The title of the activity should be "PdfRendererBasic (1/10)" at first
+        String expectedActivityTitle = mActivity.getString(R.string.app_name_with_index, 1,
+                mFragment.getPageCount());
+        assertEquals(expectedActivityTitle, mActivity.getTitle());
+    }
+
+    @LargeTest
+    public void testButtons_previousDisabledAtFirst() {
+        setUpButtons();
+        // Check that the previous button is disabled at first
+        assertFalse(mButtonPrevious.isEnabled());
+        // The next button should be enabled
+        assertTrue(mButtonNext.isEnabled());
+    }
+
+    @LargeTest
+    public void testButtons_bothEnabledInMiddle() {
+        setUpButtons();
+        turnPages(1);
+        // Two buttons should be both enabled
+        assertTrue(mButtonPrevious.isEnabled());
+        assertTrue(mButtonNext.isEnabled());
+    }
+
+    @LargeTest
+    public void testButtons_nextDisabledLastPage() {
+        setUpButtons();
+        int pageCount = mFragment.getPageCount();
+        // Click till it reaches the last page
+        turnPages(pageCount - 1);
+        // Check the page count
+        String expectedActivityTitle = mActivity.getString(R.string.app_name_with_index,
+                pageCount, pageCount);
+        assertEquals(expectedActivityTitle, mActivity.getTitle());
+        // The previous button should be enabled
+        assertTrue(mButtonPrevious.isEnabled());
+        // Check that the next button is disabled
+        assertFalse(mButtonNext.isEnabled());
+    }
+
+    @LargeTest
+    public void testOrientationChangePreserveState() {
+        mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        setUpButtons();
+        turnPages(1);
+        int pageCount = mFragment.getPageCount();
+        String expectedActivityTitle = mActivity.getString(R.string.app_name_with_index,
+                2, pageCount);
+        assertEquals(expectedActivityTitle, mActivity.getTitle());
+        mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        // Check that the title is the same after orientation change
+        assertEquals(expectedActivityTitle, mActivity.getTitle());
+    }
+
+    /**
+     * Prepares references to the buttons "Previous" and "Next".
+     */
+    private void setUpButtons() {
+        View view = mFragment.getView();
+        assertNotNull(view);
+        mButtonPrevious = (Button) view.findViewById(R.id.previous);
+        assertNotNull(mButtonPrevious);
+        mButtonNext = (Button) view.findViewById(R.id.next);
+        assertNotNull(mButtonNext);
+    }
+
+    /**
+     * Click the "Next" button to turn the pages.
+     *
+     * @param count The number of times to turn pages.
+     */
+    private void turnPages(int count) {
+        for (int i = 0; i < count; ++i) {
+            TouchUtils.clickView(this, mButtonNext);
+        }
+    }
+
+}

PdfRendererBasicSample/src/main/res/drawable-hdpi/tile.9.png Application/src/main/res/drawable-hdpi/tile.9.png

@@ -1,4 +1 @@
-
-
-
-include 'PdfRendererBasicSample'
+include 'Application'