Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98

am: bb86b53a06

Change-Id: I8fcb2b002c6007dafaeeee882a00937f4aa94e79

AndroidManifest.xml

@@ -3131,7 +3131,7 @@
         <activity android:name=".support.SupportDashboardActivity"
                   android:label="@string/page_tab_title_support"
                   android:icon="@drawable/ic_help"
-                  android:theme="@android:style/Theme.NoDisplay"
+                  android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
                   android:enabled="@bool/config_support_enabled">
             <intent-filter android:priority="-2">
                 <action android:name="com.android.settings.action.SETTINGS"/>

src/com/android/settings/support/SupportDashboardActivity.java

@@ -47,9 +47,9 @@ public class SupportDashboardActivity extends Activity implements Indexable {
             supportFeatureProvider.startSupportV2(this);
         } else {
             startActivity(new Intent(this, LegacySupportActivity.class));
-        }
             finish();
         }
+    }
 
     /**
      * For Search.