Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eae770a authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Make the support loader activity display UI." into oc-dr1-dev 

am: 4ab6f77f

Change-Id: I06dea000a9bc74314905f49843262e79a6c240dd
parents 91468e30 4ab6f77f

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ public class SupportDashboardActivity extends Activity implements Indexable { 
            supportFeatureProvider.startSupportV2(this);

        } else {

            startActivity(new Intent(this, LegacySupportActivity.class));

        }

            finish();

        }

    }



    /**

     * For Search.