Merge "Fix Settings activity typo." into nyc-dev

am: 77359ad

* commit '77359ad76117c3ffc7fe40890f8bbdc8736f143c':
  Fix Settings activity typo.

Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd
This commit is contained in:
Ruben Brunk
2016-04-08 05:18:52 +00:00
committed by android-build-merger
2 changed files with 3 additions and 1 deletions

View File

@@ -96,7 +96,7 @@ public class Settings extends SettingsActivity {
public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class VrListenerSettingsActivity extends SettingsActivity { /* empty */ }
public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class ConditionProviderSettingsActivity extends SettingsActivity { /* empty */ }
public static class UsbSettingsActivity extends SettingsActivity { /* empty */ }

View File

@@ -66,6 +66,7 @@ import com.android.settings.applications.ProcessStatsSummary;
import com.android.settings.applications.ProcessStatsUi;
import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.WriteSettingsDetails;
import com.android.settings.applications.VrListenerSettings;
import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.dashboard.DashboardSummary;
import com.android.settings.dashboard.SearchResultsSummary;
@@ -325,6 +326,7 @@ public class SettingsActivity extends SettingsDrawerActivity
WriteSettingsDetails.class.getName(),
AdvancedAppSettings.class.getName(),
WallpaperTypeSettings.class.getName(),
VrListenerSettings.class.getName(),
};