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

Commit e763ebcb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add Wifi calling Preference slice and other cleanup"

parents 4661045f 6b186935

res/drawable/ic_radio_button_checked_black_24dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright 2018 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:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>

</vector>

res/drawable/ic_radio_button_unchecked_black_24dp.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright 2018 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:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>

</vector>

res/drawable/radio_button_check.xml

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

<!--

  ~ Copyright 2018 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.

  -->

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

    <item

        android:id="@+id/on"

        android:state_checked="true"

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

    <item

        android:id="@+id/off"

        android:state_checked="false"

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

</selector>
 
 No newline at end of file

src/com/android/settings/slices/SettingsSliceProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -211,6 +211,11 @@ public class SettingsSliceProvider extends SliceProvider { 
                    .getSlicesFeatureProvider()

                    .getNewEnhanced4gLteSliceHelper(getContext())

                    .createEnhanced4gLteSlice(sliceUri);

        } else if (WifiCallingSliceHelper.WIFI_CALLING_PREFERENCE_URI.equals(sliceUri)) {

            return FeatureFactory.getFactory(getContext())

                    .getSlicesFeatureProvider()

                    .getNewWifiCallingSliceHelper(getContext())

                    .createWifiCallingPreferenceSlice(sliceUri);

        }



            SliceData cachedSliceData = mSliceWeakDataCache.get(sliceUri);

src/com/android/settings/slices/SliceBroadcastReceiver.java

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLAT 
import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED;

import static com.android.settings.wifi.WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED;

import static com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED;

import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY;

import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED;

import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED;



import android.app.slice.Slice;

import android.content.BroadcastReceiver;
@@ -91,6 +94,14 @@ public class SliceBroadcastReceiver extends BroadcastReceiver { 
                        .getNewEnhanced4gLteSliceHelper(context)

                        .handleEnhanced4gLteChanged(intent);

                break;

            case ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY:

            case ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED:

            case ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED:

                FeatureFactory.getFactory(context)

                        .getSlicesFeatureProvider()

                        .getNewWifiCallingSliceHelper(context)

                        .handleWifiCallingPreferenceChanged(intent);

                break;

            default:

                final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);

                if (!TextUtils.isEmpty(uriString)) {