From 67ca29f94c041187ab00a9aacabb7261b4ecb206 Mon Sep 17 00:00:00 2001
From: Daniel Nishi <dhnishi@google.com>
Date: Mon, 17 Jul 2017 12:49:04 -0700
Subject: [PATCH] Make the support loader activity display UI.

This lets us show a loader before jumping into the support UI.

Bug: 63117391
Test: Manual
Change-Id: Ie9660f7e89cc02d59e24798f22ca9cd0ef11701d
---
 AndroidManifest.xml                                            | 2 +-
 src/com/android/settings/support/SupportDashboardActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0c4e25b40cf..4e3f0a52e76 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3074,7 +3074,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"/>
diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java
index d3fcf9a8a28..819d5f72f44 100644
--- a/src/com/android/settings/support/SupportDashboardActivity.java
+++ b/src/com/android/settings/support/SupportDashboardActivity.java
@@ -47,8 +47,8 @@ public class SupportDashboardActivity extends Activity implements Indexable {
             supportFeatureProvider.startSupportV2(this);
         } else {
             startActivity(new Intent(this, LegacySupportActivity.class));
+            finish();
         }
-        finish();
     }
 
     /**