From 0578a725bf6905267b9caed6f5a8cedb2946e71e Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 13 Aug 2015 15:31:25 -0400
Subject: [PATCH] Clean up phone window save/restore

Comment clean up, final declarations only. No functional changes.

Change-Id: Ied118bcbd0462e2bf9745dee683d9e54a9767b1a
---
 .../android/internal/policy/PhoneWindow.java  | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 1068b512307dd..2f4767cdca2cc 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -2004,40 +2004,35 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
     static private final String PANELS_TAG = "android:Panels";
     static private final String ACTION_BAR_TAG = "android:ActionBar";
 
-    /** {@inheritDoc} */
     @Override
     public Bundle saveHierarchyState() {
-        Bundle outState = new Bundle();
+        final Bundle outState = new Bundle();
         if (mContentParent == null) {
             return outState;
         }
 
-        SparseArray<Parcelable> states = new SparseArray<Parcelable>();
+        final SparseArray<Parcelable> states = new SparseArray<>();
         mContentParent.saveHierarchyState(states);
         outState.putSparseParcelableArray(VIEWS_TAG, states);
 
-        // save the focused view id
-        View focusedView = mContentParent.findFocus();
-        if (focusedView != null) {
-            if (focusedView.getId() != View.NO_ID) {
-                outState.putInt(FOCUSED_ID_TAG, focusedView.getId());
-            } else {
-                if (false) {
-                    Log.d(TAG, "couldn't save which view has focus because the focused view "
-                            + focusedView + " has no id.");
-                }
+        // Save the focused view ID.
+        final View focusedView = mContentParent.findFocus();
+        if (focusedView != null && focusedView.getId() != View.NO_ID) {
+            outState.putInt(FOCUSED_ID_TAG, focusedView.getId());
+        }
             }
         }
 
-        // save the panels
-        SparseArray<Parcelable> panelStates = new SparseArray<Parcelable>();
+        // Save the panel states, if any.
+        final SparseArray<Parcelable> panelStates = new SparseArray<>();
         savePanelState(panelStates);
         if (panelStates.size() > 0) {
             outState.putSparseParcelableArray(PANELS_TAG, panelStates);
         }
 
+        // Save the action bar states, if any.
         if (mDecorContentParent != null) {
-            SparseArray<Parcelable> actionBarStates = new SparseArray<Parcelable>();
+            final SparseArray<Parcelable> actionBarStates = new SparseArray<>();
             mDecorContentParent.saveToolbarHierarchyState(actionBarStates);
             outState.putSparseParcelableArray(ACTION_BAR_TAG, actionBarStates);
         }
@@ -2045,33 +2040,31 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
         return outState;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void restoreHierarchyState(Bundle savedInstanceState) {
         if (mContentParent == null) {
             return;
         }
 
-        SparseArray<Parcelable> savedStates
-                = savedInstanceState.getSparseParcelableArray(VIEWS_TAG);
+        final SparseArray<Parcelable> savedStates =
+                savedInstanceState.getSparseParcelableArray(VIEWS_TAG);
         if (savedStates != null) {
             mContentParent.restoreHierarchyState(savedStates);
         }
 
-        // restore the focused view
-        int focusedViewId = savedInstanceState.getInt(FOCUSED_ID_TAG, View.NO_ID);
+        // Restore the focused view.
+        final int focusedViewId = savedInstanceState.getInt(FOCUSED_ID_TAG, View.NO_ID);
         if (focusedViewId != View.NO_ID) {
-            View needsFocus = mContentParent.findViewById(focusedViewId);
+            final View needsFocus = mContentParent.findViewById(focusedViewId);
             if (needsFocus != null) {
                 needsFocus.requestFocus();
             } else {
-                Log.w(TAG,
-                        "Previously focused view reported id " + focusedViewId
-                                + " during save, but can't be found during restore.");
+                Log.w(TAG, "Previously focused view reported id " + focusedViewId
+                        + " during save, but can't be found during restore.");
             }
         }
 
-        // restore the panels
+        // Restore the panels.
         SparseArray<Parcelable> panelStates = savedInstanceState.getSparseParcelableArray(PANELS_TAG);
         if (panelStates != null) {
             restorePanelState(panelStates);