fix [2179436] Maps does not display compass when option is turned on
remove the compass option from SpareParts
diff --git a/apps/SpareParts/res/layout/spare_parts.xml b/apps/SpareParts/res/layout/spare_parts.xml
index 6ef40d2..c1cd3c8 100644
--- a/apps/SpareParts/res/layout/spare_parts.xml
+++ b/apps/SpareParts/res/layout/spare_parts.xml
@@ -38,13 +38,6 @@
android:layout_alignParentLeft="true">
</Spinner>
- <CheckBox android:id="@+id/show_maps_compass"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/transition_animation_scale"
- android:layout_alignParentLeft="true"
- android:text="@string/development_settings_show_maps_compass_text" />
-
</RelativeLayout>
</ScrollView>
diff --git a/apps/SpareParts/res/values/strings.xml b/apps/SpareParts/res/values/strings.xml
index cd12fb3..e157730 100644
--- a/apps/SpareParts/res/values/strings.xml
+++ b/apps/SpareParts/res/values/strings.xml
@@ -59,12 +59,6 @@
<string name="applications_title">Applications</string>
- <string name="title_maps_compass">Show compass in Maps</string>
- <string name="summary_on_maps_compass">Compass is displayed in Maps</string>
- <string name="summary_off_maps_compass">Compass is not displayed in Maps</string>
-
- <string name="development_settings_show_maps_compass_text">Show compass in Maps</string>
-
<!-- Sound & display settings screen, compatibility mode check box label -->
<string name="compatibility_mode_title">Compatibility Mode</string>
<!-- Sound & display settings screen, compatibility mode option summary text when check box is selected -->
diff --git a/apps/SpareParts/res/xml/spare_parts.xml b/apps/SpareParts/res/xml/spare_parts.xml
index cbc3864..524092e 100644
--- a/apps/SpareParts/res/xml/spare_parts.xml
+++ b/apps/SpareParts/res/xml/spare_parts.xml
@@ -101,16 +101,5 @@
android:summaryOn="@string/compatibility_mode_summary_on"
android:summaryOff="@string/compatibility_mode_summary_off" />
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/applications_title">
-
- <CheckBoxPreference
- android:key="maps_compass"
- android:title="@string/title_maps_compass"
- android:summaryOn="@string/summary_on_maps_compass"
- android:summaryOff="@string/summary_off_maps_compass"/>
-
- </PreferenceCategory>
-
+
</PreferenceScreen>
diff --git a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
index 77022ad..099f27a 100644
--- a/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
+++ b/apps/SpareParts/src/com/android/spare_parts/SpareParts.java
@@ -57,7 +57,6 @@
private static final String HAPTIC_FEEDBACK_PREF = "haptic_feedback";
private static final String FONT_SIZE_PREF = "font_size";
private static final String END_BUTTON_PREF = "end_button";
- private static final String MAPS_COMPASS_PREF = "maps_compass";
private static final String KEY_COMPATIBILITY_MODE = "compatibility_mode";
private final Configuration mCurConfig = new Configuration();
@@ -68,7 +67,6 @@
private CheckBoxPreference mHapticFeedbackPref;
private ListPreference mFontSizePref;
private ListPreference mEndButtonPref;
- private CheckBoxPreference mShowMapsCompassPref;
private CheckBoxPreference mCompatibilityMode;
private IWindowManager mWindowManager;
@@ -125,7 +123,6 @@
mFontSizePref.setOnPreferenceChangeListener(this);
mEndButtonPref = (ListPreference) prefSet.findPreference(END_BUTTON_PREF);
mEndButtonPref.setOnPreferenceChangeListener(this);
- mShowMapsCompassPref = (CheckBoxPreference) prefSet.findPreference(MAPS_COMPASS_PREF);
mCompatibilityMode = (CheckBoxPreference) findPreference(KEY_COMPATIBILITY_MODE);
mCompatibilityMode.setPersistent(false);
mCompatibilityMode.setChecked(Settings.System.getInt(getContentResolver(),
@@ -145,20 +142,12 @@
}
private void updateToggles() {
- try {
- mFancyImeAnimationsPref.setChecked(Settings.System.getInt(
- getContentResolver(),
- Settings.System.FANCY_IME_ANIMATIONS, 0) != 0);
- mHapticFeedbackPref.setChecked(Settings.System.getInt(
- getContentResolver(),
- Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0);
- Context c = createPackageContext("com.google.android.apps.maps", 0);
- mShowMapsCompassPref.setChecked(c.getSharedPreferences("extra-features", MODE_WORLD_READABLE)
- .getBoolean("compass", false));
- } catch (NameNotFoundException e) {
- Log.w(TAG, "Failed reading maps compass");
- e.printStackTrace();
- }
+ mFancyImeAnimationsPref.setChecked(Settings.System.getInt(
+ getContentResolver(),
+ Settings.System.FANCY_IME_ANIMATIONS, 0) != 0);
+ mHapticFeedbackPref.setChecked(Settings.System.getInt(
+ getContentResolver(),
+ Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0);
}
public boolean onPreferenceChange(Preference preference, Object objValue) {
@@ -261,17 +250,6 @@
Settings.System.putInt(getContentResolver(),
Settings.System.HAPTIC_FEEDBACK_ENABLED,
mHapticFeedbackPref.isChecked() ? 1 : 0);
- } else if (MAPS_COMPASS_PREF.equals(key)) {
- try {
- Context c = createPackageContext("com.google.android.apps.maps", 0);
- c.getSharedPreferences("extra-features", MODE_WORLD_WRITEABLE)
- .edit()
- .putBoolean("compass", mShowMapsCompassPref.isChecked())
- .commit();
- } catch (NameNotFoundException e) {
- Log.w(TAG, "Failed setting maps compass");
- e.printStackTrace();
- }
}
}