Improve style consistency with AOSP

Also unify copyright

NOTICE

@@ -1,6 +1,6 @@
 This sample uses the following software:
 
-Copyright 2015 The Android Open Source Project
+Copyright 2015 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

app/src/androidTest/java/com/google/samples/apps/topeka/helper/AnswerHelperTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.helper;
 
 import android.support.test.runner.AndroidJUnit4;

app/src/androidTest/java/com/google/samples/apps/topeka/helper/ParcelableHelperTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.helper;
 
 import android.os.Parcel;

app/src/androidTest/java/com/google/samples/apps/topeka/helper/PreferencesHelperTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.helper;
 
 import android.content.Context;

app/src/androidTest/java/com/google/samples/apps/topeka/model/CategoryTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model;
 
 import android.os.Parcel;

app/src/androidTest/java/com/google/samples/apps/topeka/model/PlayerTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model;
 
 import android.os.Parcel;

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/AbsQuizTestCase.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 import android.os.Parcel;

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/AlphaPickerQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class AlphaPickerQuizTest extends AbsQuizTestCase<AlphaPickerQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/FillBlankQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class FillBlankQuizTest extends AbsQuizTestCase<FillBlankQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/FillTwoBlanksQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class FillTwoBlanksQuizTest extends AbsQuizTestCase<FillTwoBlanksQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/FourQuarterQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class FourQuarterQuizTest extends AbsQuizTestCase<FourQuarterQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/MultiSelectQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class MultiSelectQuizTest extends AbsQuizTestCase<MultiSelectQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/PickerQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class PickerQuizTest extends AbsQuizTestCase<PickerQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/SelectItemQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class SelectItemQuizTest extends AbsQuizTestCase<SelectItemQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/ToggleTranslateQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class ToggleTranslateQuizTest extends AbsQuizTestCase<ToggleTranslateQuiz> {

app/src/androidTest/java/com/google/samples/apps/topeka/model/quiz/TrueFalseQuizTest.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.model.quiz;
 
 public class TrueFalseQuizTest extends AbsQuizTestCase<TrueFalseQuiz> {

app/src/debug/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright 2015 Google Inc.
   ~
@@ -15,9 +14,8 @@
   ~ limitations under the License.
   -->
 
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- speed up app deployment in debug mode -->
     <application android:vmSafeMode="true"
-        android:allowBackup="false" />
+                 android:allowBackup="false" />
 </manifest>

app/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright 2015 Google Inc.
   ~
@@ -15,34 +14,29 @@
   ~ limitations under the License.
   -->
 
-<manifest
-    package="com.google.samples.apps.topeka"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.samples.apps.topeka">
 
-    <application
-        android:allowBackup="false"
-        android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="false"
-        android:theme="@style/Topeka">
+    <application android:allowBackup="false"
+                 android:hardwareAccelerated="true"
+                 android:icon="@mipmap/ic_launcher"
+                 android:label="@string/app_name"
+                 android:supportsRtl="false"
+                 android:theme="@style/Topeka">
 
-        <activity
-            android:name=".activity.SignInActivity"
-            android:windowSoftInputMode="adjustPan">
+        <activity android:name=".activity.SignInActivity"
+                  android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".activity.CategorySelectionActivity"
-            android:theme="@style/Topeka.CategorySelectionActivity" />
+        <activity android:name=".activity.CategorySelectionActivity"
+                  android:theme="@style/Topeka.CategorySelectionActivity" />
 
-        <activity
-            android:name=".activity.QuizActivity"
-            android:windowSoftInputMode="adjustPan" />
+        <activity android:name=".activity.QuizActivity"
+                  android:windowSoftInputMode="adjustPan" />
 
     </application>
 </manifest>

app/src/main/java/android/util/IntProperty.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package android.util;
 
 /**

app/src/main/java/com/google/samples/apps/topeka/adapter/CategoryAdapter.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.adapter;
 
 import android.app.Activity;

app/src/main/java/com/google/samples/apps/topeka/adapter/CategoryViewHolder.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.adapter;
 
 import android.widget.ImageView;

app/src/main/java/com/google/samples/apps/topeka/adapter/OptionsQuizAdapter.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.adapter;
 
 import android.content.Context;
@@ -54,8 +55,8 @@ public OptionsQuizAdapter(String[] options, @LayoutRes int layoutId) {
      * @param context The context for the adapter.
      * @param withPrefix True if a prefix should be given to all items.
      */
-    public OptionsQuizAdapter(String[] options, @LayoutRes int layoutId, Context context,
-            boolean withPrefix) {
+    public OptionsQuizAdapter(String[] options, @LayoutRes int layoutId,
+                              Context context, boolean withPrefix) {
         mOptions = options;
         mLayoutId = layoutId;
         if (withPrefix) {

app/src/main/java/com/google/samples/apps/topeka/adapter/QuizAdapter.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.adapter;
 
 import android.content.Context;

app/src/main/java/com/google/samples/apps/topeka/adapter/ScoreAdapter.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.adapter;
 
 import android.content.Context;
@@ -119,7 +120,7 @@ private Drawable getFailedIcon(Context context) {
      * @return The tinted drawable.
      */
     private Drawable loadAndTint(Context context, @DrawableRes int drawableId,
-            @ColorRes int tintColor) {
+                                 @ColorRes int tintColor) {
         Drawable imageDrawable = ContextCompat.getDrawable(context, drawableId);
         if (imageDrawable == null) {
             throw new IllegalArgumentException("The drawable with id " + drawableId

app/src/main/java/com/google/samples/apps/topeka/fragment/CategorySelectionFragment.java

@@ -43,7 +43,7 @@ public static CategorySelectionFragment newInstance() {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_categories, container, false);
     }
 
@@ -73,7 +73,7 @@ public void onResume() {
     }
 
     private void startQuizActivityWithTransition(Activity activity, View toolbar,
-            Category category) {
+                                                 Category category) {
 
         final Pair[] pairs = TransitionHelper.createSafeTransitionParticipants(activity, false,
                 new Pair<>(toolbar, activity.getString(R.string.transition_toolbar)));

app/src/main/java/com/google/samples/apps/topeka/fragment/QuizFragment.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.fragment;
 
 import android.os.Bundle;
@@ -56,7 +57,7 @@ public class QuizFragment extends android.support.v4.app.Fragment {
     private SolvedStateListener mSolvedStateListener;
 
     public static QuizFragment newInstance(String categoryId,
-            SolvedStateListener solvedStateListener) {
+                                           SolvedStateListener solvedStateListener) {
         if (categoryId == null) {
             throw new IllegalArgumentException("The category can not be null");
         }
@@ -79,7 +80,7 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-            @Nullable Bundle savedInstanceState) {
+                             @Nullable Bundle savedInstanceState) {
         // Create a themed Context and custom LayoutInflater
         // to get nicely themed views in this Fragment.
         final Theme theme = mCategory.getTheme();
@@ -165,8 +166,7 @@ private void restoreQuizState(final Bundle savedInstanceState) {
         mQuizView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
             @Override
             public void onLayoutChange(View v, int left, int top, int right, int bottom,
-                    int oldLeft,
-                    int oldTop, int oldRight, int oldBottom) {
+                                       int oldLeft, int oldTop, int oldRight, int oldBottom) {
                 mQuizView.removeOnLayoutChangeListener(this);
                 View currentChild = mQuizView.getChildAt(0);
                 if (currentChild instanceof ViewGroup) {

app/src/main/java/com/google/samples/apps/topeka/fragment/SignInFragment.java

@@ -77,13 +77,13 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-            @Nullable Bundle savedInstanceState) {
+                             @Nullable Bundle savedInstanceState) {
         final View contentView = inflater.inflate(R.layout.fragment_sign_in, container, false);
         contentView.addOnLayoutChangeListener(new View.
                 OnLayoutChangeListener() {
             @Override
             public void onLayoutChange(View v, int left, int top, int right, int bottom,
-                    int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                                       int oldLeft, int oldTop, int oldRight, int oldBottom) {
                 v.removeOnLayoutChangeListener(this);
                 setUpGridView(getView());
             }

app/src/main/java/com/google/samples/apps/topeka/helper/AnswerHelper.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.helper;
 
 import android.util.Log;

app/src/main/java/com/google/samples/apps/topeka/helper/JsonHelper.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.helper;
 
 import android.util.Log;

app/src/main/java/com/google/samples/apps/topeka/helper/ParcelableHelper.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.helper;
 
 import android.os.Parcel;

app/src/main/java/com/google/samples/apps/topeka/helper/PreferencesHelper.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.google.samples.apps.topeka.helper;
 
 import android.content.Context;

app/src/main/java/com/google/samples/apps/topeka/helper/TransitionHelper.java

@@ -37,11 +37,12 @@ public class TransitionHelper {
      *
      * @param activity The activity used as start for the transition.
      * @param includeStatusBar If false, the status bar will not be added as the transition
-     *        participant.
+     * participant.
      * @return All transition participants.
      */
     public static Pair[] createSafeTransitionParticipants(@NonNull Activity activity,
-            boolean includeStatusBar, @Nullable Pair... otherParticipants) {
+                                                          boolean includeStatusBar,
+                                                          @Nullable Pair... otherParticipants) {
         // Avoid system UI glitches as described here:
         // https://plus.google.com/+AlexLockwood/posts/RPtwZ5nNebb
         View decor = activity.getWindow().getDecorView();