Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17b179d5 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Move alert dialog title into date picker header"

parents 55bcae86 78abae29

core/res/res/layout-sw600dp/date_picker_dialog.xml

+14 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2007, 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.

*/

     Copyright (C) 2007 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.

-->



<DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,5 +21,4 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:spinnersShown="true"

    android:calendarViewShown="true"

    />
 
    android:calendarViewShown="true" />

core/res/res/layout/date_picker_dialog.xml

+14 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2007, 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.

*/

     Copyright (C) 2007 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.

-->



<DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,5 +21,4 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:spinnersShown="true"

    android:calendarViewShown="false"

    />
 
    android:calendarViewShown="false" />

core/res/res/layout/date_picker_header_material.xml

+40 −29
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ 


<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:id="@+id/date_picker_header"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:orientation="vertical">



    <ViewStub

        android:id="@id/topPanel"

        android:layout="@layout/alert_dialog_title_material"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="?attr/dialogPreferredPadding"
@@ -49,5 +60,5 @@ 
            android:gravity="start"

            android:maxLines="2"

            android:ellipsize="none" />



    </LinearLayout>

</LinearLayout>