erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-13 11:07:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(oem/fv/android): Refresh Settings menu

Browse source
This commit is contained in:
Darcy Wong 2022-03-09 14:52:11 +07:00
parent e138ca382e
commit 2b7d10718b
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/FVKeyboardSettingsActivity.java
View file

@ -3,6 +3,7 @@ package com.firstvoices.keyboards;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@ -11,7 +12,6 @@ import android.os.Bundle;
import android.view.View;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
@ -46,7 +46,7 @@ import java.util.HashMap;
* Displays an FV Keyboard enable and some lexical model switches.
*/
public final class FVKeyboardSettingsActivity extends AppCompatActivity {
private Context context;
private static Context context = null;
private static Toolbar toolbar = null;
private static TextView fvKeyboardTextView = null;
private static TextView fvVersionTextView = null;
@ -57,6 +57,7 @@ public final class FVKeyboardSettingsActivity extends AppCompatActivity {
private String associatedLexicalModel = "";
private String lgCode;
private static RelativeLayout checkModelLayout = null;
private static Bundle bundle = null;
private static ListView listView = null;
private String lgName;
private String kbId;
@ -119,7 +120,9 @@ public final class FVKeyboardSettingsActivity extends AppCompatActivity {
context = this;
setContentView(R.layout.fv_keyboard_settings_list_layout);
Bundle bundle = getIntent().getExtras();
if (getIntent() != null && getIntent().getExtras() != null) {
bundle = getIntent().getExtras();
}
if (bundle == null) {
// Should never actually happen.
KMLog.LogError(TAG, "Language data not specified for FVKeyboardSettingsActivity!");
@ -152,7 +155,6 @@ public final class FVKeyboardSettingsActivity extends AppCompatActivity {
toolbar = (Toolbar) findViewById(R.id.list_toolbar);
setSupportActionBar(toolbar);
int actionBarHeight = toolbar.getLayoutParams().height;
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(false);
@ -376,8 +378,12 @@ public final class FVKeyboardSettingsActivity extends AppCompatActivity {
if (listAdapter != null) {
listAdapter.notifyDataSetChanged();
}
}
//updateDictionariesSection();
public static void restartActivity() {
if (context != null) {
((Activity)context).recreate();
}
}
@Override

8
oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/MainActivity.java
View file

@ -28,7 +28,7 @@ import java.util.List;
import java.util.Map;
public class MainActivity extends AppCompatActivity implements OnKeyboardDownloadEventListener {
public static Context context;
public Context context;
FVDownloadResultReceiver resultReceiver;
@ -275,12 +275,10 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardDownloa
// let's register the associated lexical model.
if(matchingModel) {
KMManager.registerAssociatedLexicalModel(langId);
// Update associated dictionary string if applicable
FVKeyboardSettingsActivity.notifyDataSetChanged();
//FVKeyboardSettingsActivity.updateDictionariesSection(context);
}
// Launch/refresh FV Keyboard Settings menu
FVKeyboardSettingsActivity.restartActivity();
}
}