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

Commit 4275c7e9 authored by Anthony Hugh's avatar Anthony Hugh Committed by Android Git Automerger
Browse files

am fbe307f9: Merge "Permissions Watch settings UI port" into cw-e-dev 

* commit 'fbe307f9':
  Permissions Watch settings UI port
parents f5a6941d fbe307f9

res/layout-watch/settings.xml

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

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

-->

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

        android:id="@+id/container"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

    <include layout="@layout/settings_internal" />

</FrameLayout>

res/layout-watch/settings_internal.xml

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

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

-->

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

    <TextView

        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_height="@dimen/settings_header_base_height"

        android:layout_marginLeft="16dp"

        android:layout_marginTop="@dimen/settings_header_top_margin"

        android:textSize="@dimen/setting_short_header_text_size"

        android:maxLines="2"

        android:ellipsize="end"

        android:textColor="#9E9E9E"

        android:fontFamily="sans-serif-condensed-light"

        />



    <android.support.wearable.view.WearableListView

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

        android:id="@+id/wheel"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        />

</merge>

res/values-watch/attrs.xml

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

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

    <!-- START: Ported from WearableSupport -->

    <declare-styleable name="CircledImageView">

        <attr name="android:src" />

        <attr name="circle_color" format="color" />

        <attr name="circle_radius" format="dimension" />

        <attr name="circle_radius_pressed" format="dimension" />

        <attr name="circle_border_width" format="dimension" />

        <attr name="circle_border_color" format="color" />

        <attr name="circle_padding" format="dimension" />

        <attr name="shadow_width" format="dimension" />

        <attr name="image_circle_percentage" format="dimension" />

        <attr name="image_horizontal_offcenter_percentage" format="dimension" />

        <attr name="image_tint" format="color" />

        <attr name="circle_radius_percent" format="fraction" />

        <attr name="circle_radius_pressed_percent" format="fraction" />

    </declare-styleable>

    <!-- END: Ported from WearableSupport -->

</resources>

res/values-watch/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


    <color name="off_white">#ffeeeeee</color>



    <color name="primary_text_light">#424242</color>



    <!-- Copied from wearable support -->

    <color name="circular_button_disabled">#757575</color>

res/values-watch/dimens.xml

+18 −0
Original line number Diff line number Diff line
@@ -30,4 +30,22 @@ 
    <dimen name="conf_diag_3button_margin_left">16dp</dimen>

    <dimen name="conf_diag_3button_margin_bottom">9dp</dimen>





    <!-- START: Ported values -->

    <item name="default_settings_circle_radius_percent" format="fraction" type="dimen">40%</item>

    <item name="selected_settings_circle_radius_percent" format="fraction" type="dimen">50%</item>

    <dimen name="round_content_padding_left">40dp</dimen>

    <dimen name="round_content_padding_right">24dp</dimen>

    <dimen name="content_padding_left">12dp</dimen>

    <dimen name="settings_wearable_list_view_vertical_padding_round">14dp</dimen>

    <dimen name="setting_header_extra_line_height">16dp</dimen>

    <dimen name="setting_long_header_text_size">20dp</dimen>

    <dimen name="settings_header_base_height">50dp</dimen>

    <dimen name="settings_header_top_margin">14dp</dimen>

    <dimen name="settings_header_top_margin_circular">18dp</dimen>

    <dimen name="settings_header_top_margin_multiline">6dp</dimen>

    <dimen name="settings_header_top_margin_circular_multiline">16dp</dimen>

    <dimen name="setting_short_header_text_size">24dp</dimen>

    <dimen name="settings_text_margin_left">10dp</dimen>

    <!-- END: Ported values -->

</resources>