Merge "Prevent settings from being announced on wifi dialog." into nyc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c6d9d34..fbe55a7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -831,6 +831,18 @@
android:resource="@string/zen_mode_automation_suggestion_summary" />
</activity>
+ <activity android:name="Settings$WallpaperSettingsActivity"
+ android:label="@string/wallpaper_settings_fragment_title"
+ android:icon="@drawable/ic_wallpaper"
+ android:taskAffinity="">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.WALLPAPER_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.WallpaperTypeSettings" />
+ </activity>
+
<activity android:name="Settings$WallpaperSuggestionActivity"
android:label="@string/wallpaper_settings_title"
android:exported="true"
diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml
index 707a7ed..6a08d55 100644
--- a/res/layout/condition_card.xml
+++ b/res/layout/condition_card.xml
@@ -71,6 +71,8 @@
android:visibility="gone"
android:orientation="vertical">
+ <!-- TODO: Don't set alpha here, and do proper themeing that
+ handles night mode -->
<TextView
android:id="@android:id/summary"
android:layout_width="match_parent"
@@ -78,6 +80,7 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="16dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:alpha=".7"
android:textColor="?android:attr/textColorPrimaryInverse" />
<!-- TODO: Better background -->
@@ -99,6 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="0dp"
+ android:alpha=".7"
android:textColor="?android:attr/textColorPrimaryInverse"
style="?android:attr/buttonBarButtonStyle" />
@@ -106,6 +110,7 @@
android:id="@+id/second_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:alpha=".7"
android:textColor="?android:attr/textColorPrimaryInverse"
style="?android:attr/buttonBarButtonStyle" />
diff --git a/res/layout/preference_empty_list.xml b/res/layout/preference_empty_list.xml
index 9faffe3..172ec59 100644
--- a/res/layout/preference_empty_list.xml
+++ b/res/layout/preference_empty_list.xml
@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:minHeight="48dip"
android:background="@android:color/transparent">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0fbb427..6ed6612 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -599,7 +599,7 @@
<!-- Wireless controls settings screen, setting check box label -->
<string name="airplane_mode">Airplane mode</string>
<!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN. This will take you to another screen with those settings. [CHAR LIMIT=30] -->
- <string name="radio_controls_title">More</string>
+ <string name="radio_controls_title">Other networks</string>
<!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
<string name="wireless_networks_settings_title">Wireless & networks</string>
<!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 458fa2f..aeec7f1 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -135,6 +135,7 @@
/* empty */
}
public static class ScreenLockSuggestionActivity extends ChooseLockGeneric { /* empty */ }
+ public static class WallpaperSettingsActivity extends SettingsActivity { /* empty */ }
// Categories.
public static class WirelessSettings extends SettingsActivity { /* empty */ }