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

Commit fa8fc41b authored by Vinod Krishnan's avatar Vinod Krishnan
Browse files

DialogAlert window changes for Micro 

Bug: 13243004

- The only difference between alert_dialog_micro.xml and alert_dialog_holo.xml is:
<     android:layout_height="match_parent"
---
>     android:layout_height="wrap_content"
>     android:layout_marginStart="8dip"
>     android:layout_marginEnd="8dip"

Change-Id: I84f9a88099a37aa7f5868e128b19cb1e812cb745
parent 6fe328c6

core/res/res/layout/alert_dialog_micro.xml

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

<!--

  ~ Copyright (C) 2014 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:id="@+id/parentPanel"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <LinearLayout android:id="@+id/topPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">

        <View android:id="@+id/titleDividerTop"

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:visibility="gone"

            android:background="@android:color/holo_blue_light" />

        <LinearLayout android:id="@+id/title_template"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="center_vertical|start"

            android:minHeight="@dimen/alert_dialog_title_height"

            android:layout_marginStart="16dip"

            android:layout_marginEnd="16dip">

            <ImageView android:id="@+id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingEnd="8dip"

                android:src="@null" />

            <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"

                style="?android:attr/windowTitleStyle"

                android:singleLine="true"

                android:ellipsize="end"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart" />

        </LinearLayout>

        <View android:id="@+id/titleDivider"

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:visibility="gone"

            android:background="@android:color/holo_blue_light" />

        <!-- If the client uses a customTitle, it will be added here. -->

    </LinearLayout>



    <LinearLayout android:id="@+id/contentPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical"

        android:minHeight="64dp">

        <ScrollView android:id="@+id/scrollView"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false">

            <TextView android:id="@+id/message"

                style="?android:attr/textAppearanceMedium"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingStart="16dip"

                android:paddingEnd="16dip"

                android:paddingTop="8dip"

                android:paddingBottom="8dip"/>

        </ScrollView>

    </LinearLayout>



    <FrameLayout android:id="@+id/customPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:minHeight="64dp">

        <FrameLayout android:id="@+android:id/custom"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

    </FrameLayout>



    <LinearLayout android:id="@+id/buttonPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/alert_dialog_button_bar_height"

        android:orientation="vertical"

        android:divider="?android:attr/dividerHorizontal"

        android:showDividers="beginning"

        android:dividerPadding="0dip">

        <LinearLayout

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:layoutDirection="locale"

            android:measureWithLargestChild="true">

            <Button android:id="@+id/button2"

                android:layout_width="wrap_content"

                android:layout_gravity="start"

                android:layout_weight="1"

                android:maxLines="2"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:minHeight="@dimen/alert_dialog_button_bar_height"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button3"

                android:layout_width="wrap_content"

                android:layout_gravity="center_horizontal"

                android:layout_weight="1"

                android:maxLines="2"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:minHeight="@dimen/alert_dialog_button_bar_height"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button1"

                android:layout_width="wrap_content"

                android:layout_gravity="end"

                android:layout_weight="1"

                android:maxLines="2"

                android:minHeight="@dimen/alert_dialog_button_bar_height"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:layout_height="wrap_content" />

        </LinearLayout>

     </LinearLayout>

</LinearLayout>

core/res/res/values-watch/themes.xml

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

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

    <style name="Theme.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />

    <style name="Theme.Dialog.AppError" parent="Theme.Micro.Dialog.AppError" />

    <style name="Theme.Holo.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />

    <style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />

</resources>

core/res/res/values-watch/themes_device_defaults.xml

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

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

    <style name="Theme.DeviceDefault" parent="Theme.Micro" />

    <style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Micro" />

    <style name="Theme.DeviceDefault.Dialog" parent="Theme.Micro.Dialog" />

    <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Light" parent="Theme.Micro.Light" />

    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Micro.Light" />

    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Micro.Light" />

    <style name="Theme.DeviceDefault.Light.Dialog" parent="Theme.Micro.Dialog" />

    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />



</resources>

core/res/res/values/colors.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,8 @@ 
    <color name="link_text_holo_dark">#5c5cff</color>

    <color name="link_text_holo_dark">#5c5cff</color>

    <color name="link_text_holo_light">#0000ee</color>

    <color name="link_text_holo_light">#0000ee</color>





    <color name="micro_text_light">#434343</color>



    <!-- Group buttons -->

    <!-- Group buttons -->

    <eat-comment />

    <eat-comment />

    <color name="group_button_dialog_pressed_holo_dark">#46c5c1ff</color>

    <color name="group_button_dialog_pressed_holo_dark">#46c5c1ff</color>

core/res/res/values/styles_micro.xml

+33 −10
Original line number Original line Diff line number Diff line
@@ -14,21 +14,44 @@ 
     limitations under the License.

     limitations under the License.

-->

-->

<resources>

<resources>

    <style name="AlertDialog.Micro" parent="AlertDialog.Holo.Light">

        <item name="layout">@layout/alert_dialog_micro</item>

    </style>



    <style name="DialogWindowTitle.Micro">

        <item name="maxLines">1</item>

        <item name="scrollHorizontally">true</item>

        <item name="textAppearance">@style/TextAppearance.Micro.DialogWindowTitle</item>

    </style>



    <style name="TextAppearance.Micro" parent="TextAppearance.Holo">

        <item name="textSize">20sp</item>

        <item name="fontFamily">sans-serif-condensed-light</item>

        <item name="textColor">@color/micro_text_light</item>

    </style>



    <style name="TextAppearance.Micro.DialogWindowTitle" parent="TextAppearance.Holo.DialogWindowTitle">

        <item name="textSize">20sp</item>

        <item name="fontFamily">sans-serif-condensed-light</item>

        <item name="textColor">@color/micro_text_light</item>

    </style>



    <style name="Widget.Micro" parent="Widget.Holo" />

    <style name="Widget.Micro" parent="Widget.Holo" />





    <style name="Widget.Micro.TextView">

    <style name="Widget.Micro.TextView">

        <item name="android:fontFamily">sans-serif-condensed</item>

        <item name="fontFamily">sans-serif-condensed</item>

    </style>

    </style>





    <style name="Widget.Micro.NumberPicker">

    <style name="Widget.Micro.NumberPicker">

        <item name="android:internalLayout">@android:layout/number_picker_with_selector_wheel_micro</item>

        <item name="internalLayout">@layout/number_picker_with_selector_wheel_micro</item>

        <item name="android:solidColor">@android:color/transparent</item>

        <item name="solidColor">@color/transparent</item>

        <item name="android:selectionDivider">@android:drawable/numberpicker_selection_divider</item>

        <item name="selectionDivider">@drawable/numberpicker_selection_divider</item>

        <item name="android:selectionDividerHeight">0dip</item>

        <item name="selectionDividerHeight">0dip</item>

        <item name="android:selectionDividersDistance">104dip</item>

        <item name="selectionDividersDistance">104dip</item>

        <item name="android:internalMinWidth">64dip</item>

        <item name="internalMinWidth">64dip</item>

        <item name="android:internalMaxHeight">180dip</item>

        <item name="internalMaxHeight">180dip</item>

        <item name="virtualButtonPressedDrawable">?android:attr/selectableItemBackground</item>

        <item name="virtualButtonPressedDrawable">?attr/selectableItemBackground</item>

        <item name="android:descendantFocusability">blocksDescendants</item>

        <item name="descendantFocusability">blocksDescendants</item>

    </style>

    </style>



</resources>
 
</resources>