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

Commit c6fa624f authored by Yorke Lee's avatar Yorke Lee Committed by Android Partner Code Review
Browse files

Merge "Cleanup AnswerFragment glowpad UI" into m-wireless-dev

parents c94e7eb3 1be65f37

InCallUI/res/drawable/ic_lockscreen_answer_rx_video.xml

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

<!--

  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.

  ~ Not a Contribution.

  ~ 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

  -->

<!-- Used with incoming call wigdet. -->

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

    <item

        android:state_enabled="true" android:state_active="false" android:state_focused="false"

        android:drawable="@drawable/ic_lockscreen_answer_rx_video_normal_layer"/>

    <item

        android:state_enabled="true" android:state_active="true"  android:state_focused="false"

        android:drawable="@drawable/ic_lockscreen_answer_rx_video_activated_layer" />

    <item

        android:state_enabled="true" android:state_active="false"  android:state_focused="true"

        android:drawable="@drawable/ic_lockscreen_answer_rx_video_activated_layer" />

</selector>

InCallUI/res/drawable/ic_lockscreen_answer_rx_video_activated_layer.xml

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

<!--

  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.

  ~ Not a Contribution.

  ~ 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

  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:drawable="@drawable/fab_red" />

    <item>

        <bitmap

            android:gravity="center"

            android:src="@drawable/ic_rx_videocam"

            android:tint="@color/glowpad_widget_active_color"

            android:autoMirrored="true" />

    </item>

</layer-list>

InCallUI/res/drawable/ic_lockscreen_answer_rx_video_normal_layer.xml

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

<!--

  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.

  ~ Not a Contribution.

  ~ 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

  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- A fake circle to fix the size of this layer asset. -->

    <item>

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

            <solid android:color="#00000000"/>

            <size

                android:width="@dimen/incoming_call_widget_circle_size"

                android:height="@dimen/incoming_call_widget_circle_size" />

        </shape>

    </item>

    <item>

        <bitmap

            android:gravity="center"

            android:src="@drawable/ic_rx_videocam"

            android:tint="@color/glowpad_call_widget_normal_tint"

            android:autoMirrored="true" />

    </item>

</layer-list>

InCallUI/res/drawable/ic_lockscreen_answer_tx_video.xml

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

<!--

  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.

  ~ Not a Contribution.

  ~ 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

  -->

<!-- Used with incoming call wigdet. -->

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

    <item

        android:state_enabled="true" android:state_active="false" android:state_focused="false"

        android:drawable="@drawable/ic_lockscreen_answer_tx_video_normal_layer"/>

    <item

        android:state_enabled="true" android:state_active="true"  android:state_focused="false"

        android:drawable="@drawable/ic_lockscreen_answer_tx_video_activated_layer" />

    <item

        android:state_enabled="true" android:state_active="false"  android:state_focused="true"

        android:drawable="@drawable/ic_lockscreen_answer_tx_video_activated_layer" />

</selector>

InCallUI/res/drawable/ic_lockscreen_answer_tx_video_activated_layer.xml

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

<!--

  ~ Copyright (c) 2014, The Linux Foundation. All rights reserved.

  ~ Not a Contribution.

  ~ 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

  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:drawable="@drawable/fab_green" />

    <item>

        <bitmap

            android:gravity="center"

            android:src="@drawable/ic_tx_videocam"

            android:tint="@color/glowpad_widget_active_color"

            android:autoMirrored="true" />

    </item>

</layer-list>