diff options
| author | Mindy Pereira <mindyp@google.com> | 2011-08-23 18:07:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-23 18:07:53 -0700 |
| commit | b620c2e74ab66479c0c264204645778fdc518498 (patch) | |
| tree | 2e51809478666ff831a0f479233ef247be2bb29c | |
| parent | 520cbbb8a5cb728eb9244a9c2ef5c917b56be756 (diff) | |
| parent | ae5c823af5bf36bb6823275f0f587dff133067dc (diff) | |
| download | android_packages_apps_ExactCalculator-b620c2e74ab66479c0c264204645778fdc518498.tar.gz android_packages_apps_ExactCalculator-b620c2e74ab66479c0c264204645778fdc518498.tar.bz2 android_packages_apps_ExactCalculator-b620c2e74ab66479c0c264204645778fdc518498.zip | |
Merge "Always show the same max number of digits for a result."
| -rw-r--r-- | res/layout-land/main.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/main.xml | 2 | ||||
| -rw-r--r-- | res/layout-sw600dp-land/main.xml | 2 | ||||
| -rw-r--r-- | res/layout-sw600dp/main.xml | 2 | ||||
| -rw-r--r-- | res/values/constants.xml | 19 |
5 files changed, 24 insertions, 5 deletions
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml index 3fed39a..e3f255f 100644 --- a/res/layout-land/main.xml +++ b/res/layout-land/main.xml @@ -29,12 +29,12 @@ android:layout_weight="2" > - <com.android.calculator2.CalculatorDisplay + <com.android.calculator2.CalculatorDisplay android:id="@+id/display" android:layout_width="0dp" android:layout_weight="5" android:layout_height="match_parent" - maxDigits="12"> + maxDigits="@integer/max_digits"> <EditText style="@style/display_style" /> <EditText style="@style/display_style" /> diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml index ee23259..60ac2d0 100644 --- a/res/layout-port/main.xml +++ b/res/layout-port/main.xml @@ -37,7 +37,7 @@ android:layout_width="0dip" android:layout_height="match_parent" android:layout_weight="1" - maxDigits="8"> + maxDigits="@integer/max_digits"> <EditText style="@style/display_style" /> <EditText style="@style/display_style" /> diff --git a/res/layout-sw600dp-land/main.xml b/res/layout-sw600dp-land/main.xml index 020edba..9b0fff8 100644 --- a/res/layout-sw600dp-land/main.xml +++ b/res/layout-sw600dp-land/main.xml @@ -39,7 +39,7 @@ android:layout_width="0dp" android:layout_weight="1" android:layout_height="match_parent" - maxDigits="14" + maxDigits="@integer/max_digits" > <com.android.calculator2.CalculatorEditText diff --git a/res/layout-sw600dp/main.xml b/res/layout-sw600dp/main.xml index ccba54a..e149e61 100644 --- a/res/layout-sw600dp/main.xml +++ b/res/layout-sw600dp/main.xml @@ -39,7 +39,7 @@ android:layout_width="0dp" android:layout_weight="1" android:layout_height="match_parent" - maxDigits="12" + maxDigits="@integer/max_digits" > <com.android.calculator2.CalculatorEditText diff --git a/res/values/constants.xml b/res/values/constants.xml new file mode 100644 index 0000000..98c14ec --- /dev/null +++ b/res/values/constants.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <integer name="max_digits">14</integer> +</resources>
\ No newline at end of file |