bugfix on multiPane
- use dummy fragment for header category - never select header category
This commit is contained in:
parent
3336ca1edc
commit
ab76e4f123
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.cradle.iitc_mobile"
|
package="com.cradle.iitc_mobile"
|
||||||
android:versionCode="48"
|
android:versionCode="49"
|
||||||
android:versionName="0.6.4">
|
android:versionName="0.6.5">
|
||||||
|
|
||||||
<uses-sdk
|
<uses-sdk
|
||||||
android:minSdkVersion="14"
|
android:minSdkVersion="14"
|
||||||
|
@ -15,6 +15,8 @@ import android.widget.ArrayAdapter;
|
|||||||
import android.widget.ListAdapter;
|
import android.widget.ListAdapter;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.cradle.iitc_mobile.fragments.PluginsFragment;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -57,6 +59,36 @@ public class IITC_PluginPreferenceActivity extends PreferenceActivity {
|
|||||||
addHeaders();
|
addHeaders();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
if(onIsMultiPane()) getIntent()
|
||||||
|
.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, PluginsFragment.class.getName());
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onResume() {
|
||||||
|
|
||||||
|
// Call super :
|
||||||
|
super.onResume();
|
||||||
|
|
||||||
|
// Select the displayed fragment in the headers (when using a tablet) :
|
||||||
|
// This should be done by Android, it is a bug fix
|
||||||
|
// thx to http://stackoverflow.com/a/16793839
|
||||||
|
if(mHeaders != null) {
|
||||||
|
|
||||||
|
final String displayedFragment = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
|
||||||
|
if (displayedFragment != null) {
|
||||||
|
for (final Header header : mHeaders) {
|
||||||
|
if (displayedFragment.equals(header.fragment)) {
|
||||||
|
switchToHeader(header);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
|
@ -22,21 +22,23 @@ public class PluginsFragment extends PreferenceFragment {
|
|||||||
// alphabetical order
|
// alphabetical order
|
||||||
getPreferenceScreen().setOrderingAsAdded(false);
|
getPreferenceScreen().setOrderingAsAdded(false);
|
||||||
|
|
||||||
// get plugins category for this fragments and plugins list
|
if (getArguments() != null) {
|
||||||
String category = getArguments().getString("category");
|
// get plugins category for this fragments and plugins list
|
||||||
ArrayList<IITC_PluginPreference> prefs =
|
String category = getArguments().getString("category");
|
||||||
IITC_PluginPreferenceActivity.getPluginPreference(category);
|
ArrayList<IITC_PluginPreference> prefs =
|
||||||
|
IITC_PluginPreferenceActivity.getPluginPreference(category);
|
||||||
|
|
||||||
// add plugin checkbox preferences
|
// add plugin checkbox preferences
|
||||||
for (IITC_PluginPreference pref : prefs) {
|
for (IITC_PluginPreference pref : prefs) {
|
||||||
getPreferenceScreen().addPreference(pref);
|
getPreferenceScreen().addPreference(pref);
|
||||||
|
}
|
||||||
|
|
||||||
|
// set action bar stuff
|
||||||
|
ActionBar bar = getActivity().getActionBar();
|
||||||
|
category = category.replace(IITC_PluginPreferenceActivity.USER_PLUGIN, "User ");
|
||||||
|
bar.setTitle("IITC Plugins: " + category);
|
||||||
|
bar.setDisplayHomeAsUpEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// set action bar stuff
|
|
||||||
ActionBar bar = getActivity().getActionBar();
|
|
||||||
category = category.replace(IITC_PluginPreferenceActivity.USER_PLUGIN, "User ");
|
|
||||||
bar.setTitle("IITC Plugins: " + category);
|
|
||||||
bar.setDisplayHomeAsUpEnabled(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user