Merge "Bluetooth : update bt scanning Icon layout"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 962c985..22b2226 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -975,7 +975,7 @@
android:label="@string/accessibility_tutorial_title"
android:configChanges="orientation"
android:immersive="true"
- android:theme="@android:style/Theme.Holo.NoActionBar">
+ android:theme="@style/Theme.AccessibilityTutorialActivity">
<intent-filter>
<action android:name="android.settings.ACCESSIBILITY_TUTORIAL" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/values-sw600dp/themes.xml b/res/values-sw600dp/themes.xml
new file mode 100644
index 0000000..22cf17e
--- /dev/null
+++ b/res/values-sw600dp/themes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+
+ <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo.NoActionBar">
+ </style>
+</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b5f8f64..2103de1 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,4 +19,7 @@
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
+
+ <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo">
+ </style>
</resources>
diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java
index 5e65dcd..21d0028 100644
--- a/src/com/android/settings/AccessibilityTutorialActivity.java
+++ b/src/com/android/settings/AccessibilityTutorialActivity.java
@@ -481,6 +481,7 @@
private final Button mBack;
private final Button mNext;
private final Button mFinish;
+ private final int mTitleResId;
/** Which bit flags have been set. */
private long mFlags;
@@ -501,6 +502,7 @@
super(context);
mController = controller;
+ mTitleResId = titleResId;
final View container = LayoutInflater.from(context).inflate(
R.layout.accessibility_tutorial_container, this, true);
@@ -521,8 +523,6 @@
title.setText(titleResId);
}
- controller.setTitle(titleResId);
-
final ViewGroup contentHolder = (ViewGroup) container.findViewById(R.id.content);
LayoutInflater.from(context).inflate(layoutResId, contentHolder, true);
}
@@ -535,6 +535,7 @@
mFlags = 0;
mInstructions.setVisibility(View.GONE);
+ mController.setTitle(mTitleResId);
onShown();
}