TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calculator Onscreen

Browse Source
This commit is contained in:
Sergey Solovyev 2012-11-23 18:19:31 +04:00
parent b71a21a05f
commit ac5421a6c0
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calculatorpp/res/values/styles.xml
View File

@ -45,8 +45,10 @@
</style> </style>
<style name="cpp_onscreen_editor_style" parent="cpp_editor_style"> <style name="cpp_onscreen_editor_style" parent="cpp_editor_style">
<item name="android:ellipsize">none</item> <item name="android:ellipsize">end</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
<item name="android:maxLines">1</item>
<item name="android:minLines">1</item>
<item name="android:scrollbars">horizontal</item> <item name="android:scrollbars">horizontal</item>
</style> </style>

4
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
View File

@ -53,9 +53,9 @@ public class CalculatorEditorFragment extends SherlockFragment {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity()); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs); final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) { if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor_mobile, R.string.result); fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor_mobile, R.string.editor);
} else { } else {
fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor, R.string.result); fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor, R.string.editor);
} }
fragmentHelper.onCreate(this); fragmentHelper.onCreate(this);

5
calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
View File

@ -162,7 +162,10 @@ public class CalculatorOnscreenView {
button.setOnClickListener(new View.OnClickListener() { button.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
widgetButton.onClick(context); widgetButton.onClick(context);
if ( widgetButton == WidgetButton.app ) {
minimize();
}
} }
}); });
button.setOnLongClickListener(new View.OnLongClickListener() { button.setOnLongClickListener(new View.OnLongClickListener() {