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

Commit eac19cd5 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

resolve merge conflicts of 1723bc14 to stage-aosp-master 

am: 4f458421

Change-Id: I5c2b3fb86d1b6629f407df8fb607de639d972260
parents c239511c 4f458421

packages/SystemUI/res/drawable/stat_sys_signal_in.xml

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

<!--

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

-->

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

        android:autoMirrored="true"

        android:width="17dp"

        android:height="17dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:name="in"

        android:fillColor="#FFFFFFFF"

        android:pathData="M8.7,12.2l-2.0,3.5l-2.0,-3.5z" />

</vector>

packages/SystemUI/res/drawable/stat_sys_signal_inout.xml

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

<!--

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

-->

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

        android:autoMirrored="true"

        android:width="17dp"

        android:height="17dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:name="in"

        android:fillColor="#FFFFFFFF"

        android:pathData="M8.7,12.2l-2.0,3.5l-2.0,-3.5z" />

    <path

        android:name="out"

        android:fillColor="#FFFFFFFF"

        android:pathData="M0.5,15.7l2.0,-3.5l2.0,3.5z" />

</vector>

packages/SystemUI/res/drawable/stat_sys_signal_out.xml

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

<!--

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

-->

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

        android:autoMirrored="true"

        android:width="17dp"

        android:height="17dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:name="out"

        android:fillColor="#FFFFFFFF"

        android:pathData="M0.5,15.7l2.0,-3.5l2.0,3.5z" />

</vector>

packages/SystemUI/res/drawable/stat_sys_wifi_in.xml

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

<!--

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

-->

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

        android:autoMirrored="true"

        android:width="18.41dp"

        android:height="17dp"

        android:viewportWidth="26.0"

        android:viewportHeight="24.0">

    <path

        android:name="in"

        android:fillColor="#FFFFFFFF"

        android:pathData="M8.7,18.3l-2.0,3.5l-2.0,-3.5z" />

</vector>

packages/SystemUI/res/drawable/stat_sys_wifi_inout.xml

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

<!--

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

-->

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

        android:autoMirrored="true"

        android:width="18.41dp"

        android:height="17dp"

        android:viewportWidth="26.0"

        android:viewportHeight="24.0">

    <path

        android:name="in"

        android:fillColor="#FFFFFFFF"

        android:pathData="M8.7,18.3l-2.0,3.5l-2.0,-3.5z" />

    <path

        android:name="out"

        android:fillColor="#FFFFFFFF"

        android:pathData="M0.5,21.8l2.0,-3.5l2.0,3.5z" />

</vector>