Layout for large screens
This commit is contained in:
@@ -83,6 +83,9 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference
|
||||
Toolbar toolbar;
|
||||
@Bind(R.id.editor)
|
||||
FrameLayout editor;
|
||||
@Nullable
|
||||
@Bind(R.id.card)
|
||||
CardView card;
|
||||
private boolean useBackAsPrev;
|
||||
|
||||
public CalculatorActivity() {
|
||||
@@ -292,10 +295,9 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference
|
||||
}
|
||||
|
||||
private void prepareCardAndToolbar() {
|
||||
if (!(editor instanceof CardView)) {
|
||||
if (card == null) {
|
||||
return;
|
||||
}
|
||||
final CardView card = (CardView) editor;
|
||||
final Resources resources = getResources();
|
||||
final int cardTopMargin = resources.getDimensionPixelSize(R.dimen.cpp_card_margin);
|
||||
final int preLollipopCardTopPadding = Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP ? card.getPaddingTop() : 0;
|
||||
|
@@ -32,6 +32,7 @@ import android.view.ContextMenu;
|
||||
import org.solovyev.android.Check;
|
||||
import org.solovyev.android.calculator.floating.FloatingCalculatorService;
|
||||
import org.solovyev.android.calculator.view.EditTextCompat;
|
||||
import org.solovyev.android.views.Adjuster;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
@@ -64,6 +65,7 @@ public class EditorView extends EditTextCompat {
|
||||
}
|
||||
|
||||
private void init() {
|
||||
Adjuster.adjustText(this, 0.25f);
|
||||
addTextChangedListener(new MyTextWatcher());
|
||||
dontShowSoftInputOnFocusCompat();
|
||||
// changes should only be reported after the view has been set up completely, i.e. now
|
||||
|
Reference in New Issue
Block a user