diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-15 14:05:33 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-05-15 14:48:12 -0700 |
commit | c857f90590e7d7fcffa89511982eb33afd34805f (patch) | |
tree | 9910fb95c6fdb10b06ee8be02a3374d2882005b9 /java/com/android/dialer/about/res/layout | |
parent | 738bb09adee2b56c99063a0264f8f76de393143b (diff) |
Update Dialer to v10 RC32
This release was created following the instructions at:
go/dialer-aosp-release
Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.
Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32
This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514
Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
Diffstat (limited to 'java/com/android/dialer/about/res/layout')
4 files changed, 130 insertions, 0 deletions
diff --git a/java/com/android/dialer/about/res/layout/dummy_placeholder.xml b/java/com/android/dialer/about/res/layout/dummy_placeholder.xml new file mode 100644 index 000000000..6d867ef55 --- /dev/null +++ b/java/com/android/dialer/about/res/layout/dummy_placeholder.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> +<!-- See Licenses.java for why this exists. --> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/dummy_placeholder" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> diff --git a/java/com/android/dialer/about/res/layout/license.xml b/java/com/android/dialer/about/res/layout/license.xml new file mode 100644 index 000000000..ef67982a1 --- /dev/null +++ b/java/com/android/dialer/about/res/layout/license.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize" + android:baselineAligned="false" > + + <TextView android:id="@+id/license" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="15dip" + android:layout_marginLeft="15dip" + android:layout_marginEnd="6dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMediumInverse" + android:textColor="?android:attr/textColorPrimary" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + +</LinearLayout> diff --git a/java/com/android/dialer/about/res/layout/license_menu_activity.xml b/java/com/android/dialer/about/res/layout/license_menu_activity.xml new file mode 100644 index 000000000..8ed47bf68 --- /dev/null +++ b/java/com/android/dialer/about/res/layout/license_menu_activity.xml @@ -0,0 +1,35 @@ +<!-- + ~ Copyright (C) 2017 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 + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:background="@android:color/transparent"> + + <ListView android:id="@+id/license_list" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:paddingTop="0dp" + android:paddingBottom="0dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:scrollbarStyle="outsideOverlay" + android:clipToPadding="false" + android:drawSelectorOnTop="false" + android:cacheColorHint="@android:color/transparent" + android:scrollbarAlwaysDrawVerticalTrack="true" /> +</LinearLayout> diff --git a/java/com/android/dialer/about/res/layout/license_scrollview.xml b/java/com/android/dialer/about/res/layout/license_scrollview.xml new file mode 100644 index 000000000..f58bc2f43 --- /dev/null +++ b/java/com/android/dialer/about/res/layout/license_scrollview.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> + +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/license_activity_scrollview" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/license_activity_textview" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:typeface="monospace" + android:paddingStart="16dip" + android:paddingLeft="16dip" + android:paddingEnd="16dip" + android:paddingRight="16dip" + android:paddingTop="8dip" + android:paddingBottom="8dip" /> +</ScrollView>
\ No newline at end of file |