Merge "Fix scroll issue when going from Display->Ambient Display to Moves." into nyc-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 680e179..8befc35 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -959,6 +959,25 @@
android:value="com.android.settings.DisplaySettings" />
</activity-alias>
+ <activity android:name="Settings$NightDisplaySettingsActivity"
+ android:label="@string/night_display_title"
+ android:icon="@drawable/ic_settings_night_display"
+ android:taskAffinity="">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.display.NightDisplaySettings" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
<activity android:name="Settings$DeviceInfoSettingsActivity"
android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:label="@string/device_info_settings"
diff --git a/res/layout-land/font_size_activity.xml b/res/layout-sw300dp-land/font_size_activity.xml
similarity index 100%
rename from res/layout-land/font_size_activity.xml
rename to res/layout-sw300dp-land/font_size_activity.xml
diff --git a/res/layout-land/screen_zoom_activity.xml b/res/layout-sw300dp-land/screen_zoom_activity.xml
similarity index 100%
rename from res/layout-land/screen_zoom_activity.xml
rename to res/layout-sw300dp-land/screen_zoom_activity.xml
diff --git a/res/layout/preview_seek_bar_view_pager.xml b/res/layout/preview_seek_bar_view_pager.xml
index 5524d8a..e5dfa94 100644
--- a/res/layout/preview_seek_bar_view_pager.xml
+++ b/res/layout/preview_seek_bar_view_pager.xml
@@ -25,7 +25,7 @@
<android.support.v4.view.ViewPager
android:id="@+id/preview_pager"
android:layout_width="match_parent"
- android:layout_height="0dp"
+ android:layout_height="100dp"
android:layout_weight="1"
android:background="?android:attr/colorBackgroundFloating"
android:contentDescription="@string/preview_pager_content_description" />
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 3036bd18..feeabe7 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -50,6 +50,7 @@
public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ }
public static class HomeSettingsActivity extends SettingsActivity { /* empty */ }
public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }
+ public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }
public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 616cf8e..5b81c56 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -81,6 +81,7 @@
import com.android.settings.deviceinfo.SimStatus;
import com.android.settings.deviceinfo.Status;
import com.android.settings.deviceinfo.StorageSettings;
+import com.android.settings.display.NightDisplaySettings;
import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageDetail;
import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -351,6 +352,7 @@
WifiAPITest.class.getName(),
WifiInfo.class.getName(),
MasterClear.class.getName(),
+ NightDisplaySettings.class.getName(),
};
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index d0823d4..0143fa8 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -149,7 +149,7 @@
} catch (PackageManager.NameNotFoundException e) {
}
}
- if (mAppItem.key == Process.SYSTEM_UID) {
+ if (!UserHandle.isApp(mAppItem.key)) {
removePreference(KEY_UNRESTRICTED_DATA);
removePreference(KEY_RESTRICT_BACKGROUND);
} else {