summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/xml/advanced_apps.xml1
-rw-r--r--res/xml/button_settings.xml1
-rw-r--r--res/xml/default_apps.xml1
-rw-r--r--res/xml/display.xml1
-rw-r--r--res/xml/notification_manager_settings.xml1
-rw-r--r--src/com/android/settings/search/IndexDatabaseHelper.java2
6 files changed, 6 insertions, 1 deletions
diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index 70b68568c..4809be6b9 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -17,6 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/configure_apps"
android:key="applications_settings">
<PreferenceScreen
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 9a85b6f84..68e128563 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/button_pref_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<SwitchPreference
diff --git a/res/xml/default_apps.xml b/res/xml/default_apps.xml
index d5f9de043..41ab072b2 100644
--- a/res/xml/default_apps.xml
+++ b/res/xml/default_apps.xml
@@ -17,6 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/default_apps_title"
android:key="default_apps">
<Preference
diff --git a/res/xml/display.xml b/res/xml/display.xml
index e0dae5ae5..366263ea8 100644
--- a/res/xml/display.xml
+++ b/res/xml/display.xml
@@ -16,6 +16,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/display_and_lights"
settings:keywords="@string/keywords_display">
<PreferenceCategory
diff --git a/res/xml/notification_manager_settings.xml b/res/xml/notification_manager_settings.xml
index b45cb6bcf..a09eea481 100644
--- a/res/xml/notification_manager_settings.xml
+++ b/res/xml/notification_manager_settings.xml
@@ -15,6 +15,7 @@
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/notification_manager"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<!-- Heads up -->
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index fd7b76240..4fc93db79 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
private static final String TAG = "IndexDatabaseHelper";
private static final String DATABASE_NAME = "search_index.db";
- private static final int DATABASE_VERSION = 119;
+ private static final int DATABASE_VERSION = 120;
public interface Tables {
public static final String TABLE_PREFS_INDEX = "prefs_index";