mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#103524 - Fix Bottom Toolbars closing operation

Browse Source 
Added variables to control state of bottom toolbars, and based
on their state open/close the bars

Change-Id: I5f9429b336451a354b95dcee18b71fb577c28559
Reviewed-on: https://gerrit.libreoffice.org/30298
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
This commit is contained in:
Mert Tumer
2016-10-26 18:24:58 +03:00
committed by jan iversen
parent dd89c68edf
commit 252008d492
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
View File

@@ -97,6 +97,8 @@ public class LibreOfficeMainActivity extends AppCompatActivity {
} }
private boolean isKeyboardOpen = false; private boolean isKeyboardOpen = false;
private boolean isFormattingToolbarOpen = false;
private boolean isSearchToolbarOpen = false;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Log.w(LOGTAG, "onCreate.."); Log.w(LOGTAG, "onCreate..");
@@ -391,6 +393,8 @@ public class LibreOfficeMainActivity extends AppCompatActivity {
inputMethodManager.showSoftInput(layerView, InputMethodManager.SHOW_FORCED); inputMethodManager.showSoftInput(layerView, InputMethodManager.SHOW_FORCED);
} }
isKeyboardOpen=true; isKeyboardOpen=true;
isSearchToolbarOpen=false;
isFormattingToolbarOpen=false;
hideBottomToolbar(); hideBottomToolbar();
} }
@@ -445,6 +449,8 @@ public class LibreOfficeMainActivity extends AppCompatActivity {
findViewById(R.id.toolbar_bottom).setVisibility(View.GONE); findViewById(R.id.toolbar_bottom).setVisibility(View.GONE);
findViewById(R.id.formatting_toolbar).setVisibility(View.GONE); findViewById(R.id.formatting_toolbar).setVisibility(View.GONE);
findViewById(R.id.search_toolbar).setVisibility(View.GONE); findViewById(R.id.search_toolbar).setVisibility(View.GONE);
isFormattingToolbarOpen=false;
isSearchToolbarOpen=false;
} }
}); });
} }
@@ -453,10 +459,17 @@ public class LibreOfficeMainActivity extends AppCompatActivity {
LOKitShell.getMainHandler().post(new Runnable() { LOKitShell.getMainHandler().post(new Runnable() {
@Override @Override
public void run() { public void run() {
showBottomToolbar(); if(isFormattingToolbarOpen == true){
findViewById(R.id.formatting_toolbar).setVisibility(View.VISIBLE); hideBottomToolbar();
findViewById(R.id.search_toolbar).setVisibility(View.GONE); }else{
hideSoftKeyboardDirect(); showBottomToolbar();
findViewById(R.id.formatting_toolbar).setVisibility(View.VISIBLE);
findViewById(R.id.search_toolbar).setVisibility(View.GONE);
hideSoftKeyboardDirect();
isSearchToolbarOpen=false;
isFormattingToolbarOpen=true;
}
} }
}); });
} }
@@ -475,10 +488,16 @@ public class LibreOfficeMainActivity extends AppCompatActivity {
LOKitShell.getMainHandler().post(new Runnable() { LOKitShell.getMainHandler().post(new Runnable() {
@Override @Override
public void run() { public void run() {
showBottomToolbar(); if(isSearchToolbarOpen==true){
findViewById(R.id.formatting_toolbar).setVisibility(View.GONE); hideBottomToolbar();
findViewById(R.id.search_toolbar).setVisibility(View.VISIBLE); }else{
hideSoftKeyboardDirect(); showBottomToolbar();
findViewById(R.id.formatting_toolbar).setVisibility(View.GONE);
findViewById(R.id.search_toolbar).setVisibility(View.VISIBLE);
hideSoftKeyboardDirect();
isFormattingToolbarOpen=false;
isSearchToolbarOpen=true;
}
} }
}); });
} }