I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put identities inside category on legacy devices

Browse Source 
A PreferenceCategory in settings_headers_legacy.xml was not being rendered, so
it is added manually instead.
This commit is contained in:
str4d
2015-01-05 04:14:59 +00:00
parent 7bed892fd7
commit 06bf416f8a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/i2p/bote/android/config/SettingsActivity.java
View File

@@ -183,17 +183,18 @@ public class SettingsActivity extends PreferenceActivity {
private void buildLegacyHeaders() { private void buildLegacyHeaders() {
// Always add general preferences as first header // Always add general preferences as first header
addPreferencesFromResource(R.xml.settings_headers_legacy); addPreferencesFromResource(R.xml.settings_headers_legacy);
PreferenceScreen ps = getPreferenceScreen(); PreferenceCategory ic = new PreferenceCategory(this);
ic.setTitle(R.string.pref_title_identities);
// Then add zero or more identity headers as necessary // Then add zero or more identity headers as necessary
if (mLegacyIdentityListHeaders != null) { if (mLegacyIdentityListHeaders != null) {
final int headerCount = mLegacyIdentityListHeaders.length; getPreferenceScreen().addPreference(ic);
for (Preference header : mLegacyIdentityListHeaders) { for (Preference header : mLegacyIdentityListHeaders) {
if (header != null) { if (header != null) {
String key = header.getIntent().getExtras().getString( String key = header.getIntent().getExtras().getString(
ViewIdentityFragment.ADDRESS); ViewIdentityFragment.ADDRESS);
if (!key.equals(mDeletingIdentityKey)) { if (!key.equals(mDeletingIdentityKey)) {
ps.addPreference(header); ic.addPreference(header);
if (key.equals(mRequestedIdentityKey)) { if (key.equals(mRequestedIdentityKey)) {
mRequestedIdentityKey = null; mRequestedIdentityKey = null;
} }
@@ -217,7 +218,6 @@ public class SettingsActivity extends PreferenceActivity {
// Then add zero or more identity headers as necessary // Then add zero or more identity headers as necessary
if (mIdentityListHeaders != null) { if (mIdentityListHeaders != null) {
final int headerCount = mIdentityListHeaders.length;
for (Header header : mIdentityListHeaders) { for (Header header : mIdentityListHeaders) {
if (header != null && header.id != HEADER_ID_UNDEFINED) { if (header != null && header.id != HEADER_ID_UNDEFINED) {
String key = header.extras.getString( String key = header.extras.getString(