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

Commit 276ff636 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Fix eventinfo dialog size on rotation" into jb-dev

parents bc4ca6e9 363aa9c2

res/values-w1280dp-h752dp/integers.xml→res/values-w1280dp-h752dp/dimens.xml

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

<!--

    Copyright (C) 2011 The Android Open Source Project Licensed under the

    Copyright (C) 2012 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
@@ -13,6 +13,6 @@ 
<resources

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Size of event info dialog box -->

    <integer name="event_info_dialog_width">500</integer>

    <integer name="event_info_dialog_height">600</integer>

    <dimen name="event_info_dialog_width">500dip</dimen>

    <dimen name="event_info_dialog_height">600dip</dimen>

</resources>

res/values-w600dp-h879dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -42,5 +42,8 @@ 
    <dimen name="edit_event_view_padding_left">16dip</dimen>

    <dimen name="edit_event_view_padding_right">16dip</dimen>

    <dimen name="edit_reminder_min_size">48dip</dimen>

    <!-- Size of event info dialog box -->

    <dimen name="event_info_dialog_width">550dip</dimen>

    <dimen name="event_info_dialog_height">550dip</dimen>



</resources>

res/values-w600dp-h879dp/integers.xml

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,4 @@ 
    <integer name="color_chip_all_day_height">64</integer>

    <!-- The size of the color chip in the agenda view -->

    <integer name="color_chip_height">32</integer>

    <!-- Size of event info dialog box -->

    <integer name="event_info_dialog_width">550</integer>

    <integer name="event_info_dialog_height">470</integer>

</resources>

res/values-w800dp-h1232dp/dimens.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 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>

        <!-- Size of event info dialog box -->

    <dimen name="event_info_dialog_width">500dip</dimen>

    <dimen name="event_info_dialog_height">600dip</dimen>

    

</resources>

res/values-w800dp-h1232dp/integers.xml

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
<?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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Size of event info dialog box -->

    <integer name="event_info_dialog_width">500</integer>

    <integer name="event_info_dialog_height">600</integer>

</resources>