diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-10-28 16:05:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-28 16:05:32 +0000 |
| commit | e637b47baca4896c46f7ee01d58eb9da553be7f8 (patch) | |
| tree | a1263d03d71c9c2f5add50d3893246612f89e2a5 /res | |
| parent | 7029a6d09dc9b87c625015effcb4793b9429c4a3 (diff) | |
| parent | 09547536170a6309a62953c241ce330633288dee (diff) | |
| download | android_packages_apps_ExactCalculator-e637b47baca4896c46f7ee01d58eb9da553be7f8.tar.gz android_packages_apps_ExactCalculator-e637b47baca4896c46f7ee01d58eb9da553be7f8.tar.bz2 android_packages_apps_ExactCalculator-e637b47baca4896c46f7ee01d58eb9da553be7f8.zip | |
Merge "Implement ViewDragHelper to pull down history." into ub-calculator-euler
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/activity_calculator_land.xml | 2 | ||||
| -rw-r--r-- | res/layout/activity_calculator_main.xml | 31 | ||||
| -rw-r--r-- | res/layout/activity_calculator_port.xml | 2 | ||||
| -rw-r--r-- | res/layout/fragment_history.xml | 1 |
4 files changed, 34 insertions, 2 deletions
diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml index 5dd2c20..a19cd86 100644 --- a/res/layout/activity_calculator_land.xml +++ b/res/layout/activity_calculator_land.xml @@ -37,4 +37,4 @@ </LinearLayout> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/activity_calculator_main.xml b/res/layout/activity_calculator_main.xml new file mode 100644 index 0000000..9d19b53 --- /dev/null +++ b/res/layout/activity_calculator_main.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 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. + --> + +<com.android.calculator2.DragLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drag_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/activity_calculator" /> + + <FrameLayout + android:id="@+id/history_frame" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</com.android.calculator2.DragLayout>
\ No newline at end of file diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml index 30aaf00..eff5c96 100644 --- a/res/layout/activity_calculator_port.xml +++ b/res/layout/activity_calculator_port.xml @@ -43,4 +43,4 @@ </com.android.calculator2.CalculatorPadViewPager> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/fragment_history.xml b/res/layout/fragment_history.xml index b746a9c..35d2691 100644 --- a/res/layout/fragment_history.xml +++ b/res/layout/fragment_history.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/display_background_color" + android:clickable="true" android:orientation="vertical"> <Toolbar |