i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tango: fixed switch preferences changing on scrolling on Jelly bean (https://issuetracker.google.com/issues/36941388#comment4)

Browse Source
This commit is contained in:
matlabbe
2017-09-26 23:11:53 -04:00
parent 81fe104f1b
commit 11f8fda585
3 changed files with 97 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/android/AndroidManifest.xml.in
View File

@@ -2,7 +2,7 @@
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.introlab.rtabmap"
android:versionCode="57"
android:versionCode="58"
android:versionName="@RTABMAP_VERSION@">
<uses-permission android:name="android.permission.CAMERA" />

28
app/android/res/layout/activity_settings.xml
View File

@@ -58,12 +58,12 @@
android:entries="@array/pref_background_color_keys"
android:entryValues="@array/pref_background_color_values"
android:defaultValue="@string/pref_default_background_color"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_blending"
android:title="@string/pref_title_blending"
android:summary="@string/pref_summary_blending"
android:defaultValue="@string/pref_default_blending"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_nodes_filtering"
android:title="@string/pref_title_nodes_filtering"
android:summary="@string/pref_summary_nodes_filtering"
@@ -79,22 +79,22 @@
android:summary="@string/pref_summary_mapping"
android:persistent="false">
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_append"
android:title="@string/pref_title_append"
android:summary="@string/pref_summary_append"
android:defaultValue="@string/pref_default_append"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_resolution"
android:title="@string/pref_title_resolution"
android:summary="@string/pref_summary_resolution"
android:defaultValue="@string/pref_default_resolution"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_smoothing"
android:title="@string/pref_title_smoothing"
android:summary="@string/pref_summary_smoothing"
android:defaultValue="@string/pref_default_smoothing"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_fisheye"
android:title="@string/pref_title_fisheye"
android:summary="@string/pref_summary_fisheye"
@@ -179,7 +179,7 @@
android:entries="@array/pref_optimizer_keys"
android:entryValues="@array/pref_optimizer_values"
android:defaultValue="@string/pref_default_optimizer"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_optimize_end"
android:title="@string/pref_title_optimize_end"
android:summary="@string/pref_summary_optimize_end"
@@ -187,22 +187,22 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_title_mapping_database">
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_keep_all_db"
android:title="@string/pref_title_keep_all_db"
android:summary="@string/pref_summary_keep_all_db"
android:defaultValue="@string/pref_default_keep_all_db"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_raw_scan_saved"
android:title="@string/pref_title_raw_scan_saved"
android:summary="@string/pref_summary_raw_scan_saved"
android:defaultValue="@string/pref_default_raw_scan_saved"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_gps_saved"
android:title="@string/pref_title_gps_saved"
android:summary="@string/pref_summary_gps_saved"
android:defaultValue="@string/pref_default_gps_saved"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_db_in_memory"
android:title="@string/pref_title_db_in_memory"
android:summary="@string/pref_summary_db_in_memory"
@@ -264,7 +264,7 @@
android:entryValues="@array/pref_min_texture_cluster_size_values"
android:defaultValue="@string/pref_default_min_texture_cluster_size"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_block_render"
android:title="@string/pref_title_block_render"
android:summary="@string/pref_summary_block_render"
@@ -291,7 +291,7 @@
android:entryValues="@array/pref_opt_color_radius_values"
android:defaultValue="@string/pref_default_opt_color_radius"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_opt_clean_white"
android:title="@string/pref_title_opt_clean_white"
android:summary="@string/pref_summary_opt_clean_white"
@@ -321,7 +321,7 @@
android:entries="@array/pref_cluster_ratio_keys"
android:entryValues="@array/pref_cluster_ratio_values"
android:defaultValue="@string/pref_default_cluster_ratio"/>
<SwitchPreference
<com.introlab.rtabmap.CustomSwitchPreference
android:key="@string/pref_key_notification_sound"
android:title="@string/pref_title_notification_sound"
android:summary="@string/pref_summary_notification_sound"

82
app/android/src/com/introlab/rtabmap/CustomSwitchPreference.java Normal file
View File

@@ -0,0 +1,82 @@
package com.introlab.rtabmap;
import android.content.Context;
import android.preference.SwitchPreference;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Switch;
/**
*
* @author mathieu
* Bug fix of switch preferences changing states
* when scrolling on Jelly Bean:
* https://issuetracker.google.com/issues/36941388#comment4
*/
public class CustomSwitchPreference extends SwitchPreference {
/**
* Construct a new SwitchPreference with the given style options.
*
* @param context The Context that will style this preference
* @param attrs Style attributes that differ from the default
* @param defStyle Theme attribute defining the default style options
*/
public CustomSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
/**
* Construct a new SwitchPreference with the given style options.
*
* @param context The Context that will style this preference
* @param attrs Style attributes that differ from the default
*/
public CustomSwitchPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}
/**
* Construct a new SwitchPreference with default style options.
*
* @param context The Context that will style this preference
*/
public CustomSwitchPreference(Context context) {
super(context, null);
}
@Override
protected void onBindView(View view) {
// Clean listener before invoke SwitchPreference.onBindView
ViewGroup viewGroup= (ViewGroup)view;
clearListenerInViewGroup(viewGroup);
super.onBindView(view);
}
/**
* Clear listener in Switch for specify ViewGroup.
*
* @param viewGroup The ViewGroup that will need to clear the listener.
*/
private void clearListenerInViewGroup(ViewGroup viewGroup) {
if (null == viewGroup) {
return;
}
int count = viewGroup.getChildCount();
for(int n = 0; n < count; ++n) {
View childView = viewGroup.getChildAt(n);
if(childView instanceof Switch) {
final Switch switchView = (Switch) childView;
switchView.setOnCheckedChangeListener(null);
return;
} else if (childView instanceof ViewGroup){
ViewGroup childGroup = (ViewGroup)childView;
clearListenerInViewGroup(childGroup);
}
}
}
}