summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2011-08-28 12:33:33 -0700
committerMindy Pereira <mindyp@google.com>2011-08-28 12:33:33 -0700
commit6547c777c0955411f8be5dc05e3096cb6d4d8573 (patch)
tree654d9152ae877a7b3bdc425bf1508345ab185977 /res
parentdaa763f883c242c396a17f5e78b9a431406cb4bd (diff)
downloadandroid_packages_apps_ExactCalculator-6547c777c0955411f8be5dc05e3096cb6d4d8573.tar.gz
android_packages_apps_ExactCalculator-6547c777c0955411f8be5dc05e3096cb6d4d8573.tar.bz2
android_packages_apps_ExactCalculator-6547c777c0955411f8be5dc05e3096cb6d4d8573.zip
Use the CalculatorEditTextField everywhere.
That way, tablet and phone act the same. Also, Fixes bug:5215768 IRK56: Selected text in Calculator is left-aligned, but selection handles are right-aligned By giving the user the same "tap and hold to copy" behavior that tablet has Which also allows them to put the cursor anywhere in the field and replace/delete Change-Id: I896934c603833dea45cb7e267471c676fa6238f3
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/main.xml6
-rw-r--r--res/layout-port/main.xml6
2 files changed, 8 insertions, 4 deletions
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index e3f255f..ac4f8af 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -36,8 +36,10 @@
android:layout_height="match_parent"
maxDigits="@integer/max_digits">
- <EditText style="@style/display_style" />
- <EditText style="@style/display_style" />
+ <com.android.calculator2.CalculatorEditText
+ style="@style/display_style" />
+ <com.android.calculator2.CalculatorEditText
+ style="@style/display_style" />
</com.android.calculator2.CalculatorDisplay>
<ImageButton android:id="@+id/overflow_menu"
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index 60ac2d0..59795c1 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -39,8 +39,10 @@
android:layout_weight="1"
maxDigits="@integer/max_digits">
- <EditText style="@style/display_style" />
- <EditText style="@style/display_style" />
+ <com.android.calculator2.CalculatorEditText
+ style="@style/display_style" />
+ <com.android.calculator2.CalculatorEditText
+ style="@style/display_style" />
</com.android.calculator2.CalculatorDisplay>
<ImageButton android:id="@+id/overflow_menu"