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

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

Merge "Add Location Slice"

parents 8f36eb8c f1a7006d

src/com/android/settings/bluetooth/BluetoothSliceBuilder.java

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ package com.android.settings.bluetooth; 


import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;



import static androidx.slice.builders.ListBuilder.ICON_IMAGE;



import android.annotation.ColorInt;

import android.app.PendingIntent;

import android.bluetooth.BluetoothAdapter;

src/com/android/settings/location/LocationSliceBuilder.java

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

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

 *

 */



package com.android.settings.location;



import static android.provider.SettingsSlicesContract.KEY_LOCATION;



import static androidx.slice.builders.ListBuilder.ICON_IMAGE;



import android.annotation.ColorInt;

import android.app.PendingIntent;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.provider.SettingsSlicesContract;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SubSettings;

import com.android.settings.Utils;

import com.android.settings.search.DatabaseIndexingUtils;



import androidx.core.graphics.drawable.IconCompat;

import androidx.slice.Slice;

import androidx.slice.builders.ListBuilder;

import androidx.slice.builders.SliceAction;



/**

 * Utility class to build an intent-based Location Slice.

 */

public class LocationSliceBuilder {



    /**

     * Backing Uri for the Location Slice.

     */

    public static final Uri LOCATION_URI = new Uri.Builder()

            .scheme(ContentResolver.SCHEME_CONTENT)

            .authority(SettingsSlicesContract.AUTHORITY)

            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)

            .appendPath(KEY_LOCATION)

            .build();



    private LocationSliceBuilder() {

    }



    /**

     * Return a Location Slice bound to {@link #LOCATION_URI}.

     */

    public static Slice getSlice(Context context) {

        final IconCompat icon = IconCompat.createWithResource(context,

                R.drawable.ic_signal_location);

        final String title = context.getString(R.string.location_settings_title);

        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);

        final PendingIntent primaryAction = getPrimaryAction(context);

        final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);



        return new ListBuilder(context, LOCATION_URI, ListBuilder.INFINITY)

                .setAccentColor(color)

                .addRow(b -> b

                        .setTitle(title)

                        .setTitleItem(icon, ICON_IMAGE)

                        .setPrimaryAction(primarySliceAction))

                .build();

    }



    private static PendingIntent getPrimaryAction(Context context) {

        final String screenTitle = context.getText(R.string.location_settings_title).toString();

        final Uri contentUri = new Uri.Builder().appendPath(KEY_LOCATION).build();

        final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,

                LocationSettings.class.getName(), KEY_LOCATION, screenTitle,

                MetricsEvent.LOCATION)

                .setClassName(context.getPackageName(), SubSettings.class.getName())

                .setData(contentUri);



        return PendingIntent.getActivity(context, 0 /* requestCode */,

                intent, 0 /* flags */);

    }

}

src/com/android/settings/notification/ZenModeSliceBuilder.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings.notification; 


import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;



import static androidx.slice.builders.ListBuilder.ICON_IMAGE;



import android.annotation.ColorInt;

import android.app.NotificationManager;

import android.app.PendingIntent;

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

+14 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.util.KeyValueListParser; 
import android.util.Log;

import android.util.Pair;



import com.android.settings.location.LocationSliceBuilder;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.wifi.WifiSliceBuilder;
@@ -189,6 +190,8 @@ public class SettingsSliceProvider extends SliceProvider { 
            return ZenModeSliceBuilder.getSlice(getContext());

        } else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(sliceUri)) {

            return BluetoothSliceBuilder.getSlice(getContext());

        } else if (LocationSliceBuilder.LOCATION_URI.equals(sliceUri)) {

            return LocationSliceBuilder.getSlice(getContext());

        }



        SliceData cachedSliceData = mSliceWeakDataCache.get(sliceUri);
@@ -290,10 +293,17 @@ public class SettingsSliceProvider extends SliceProvider { 
    void loadSlice(Uri uri) {

        long startBuildTime = System.currentTimeMillis();



        final SliceData sliceData = mSlicesDatabaseAccessor.getSliceDataFromUri(uri);

        final SliceData sliceData;

        try {

             sliceData = mSlicesDatabaseAccessor.getSliceDataFromUri(uri);

        } catch (IllegalStateException e) {

            Log.d(TAG, "Could not create slicedata for uri: " + uri);

            return;

        }



        final BasePreferenceController controller = SliceBuilderUtils.getPreferenceController(

                    getContext(), sliceData);



        final IntentFilter filter = controller.getIntentFilter();

        if (filter != null) {

            registerIntentToUri(filter, uri);
@@ -337,7 +347,8 @@ public class SettingsSliceProvider extends SliceProvider { 
    private List<Uri> getSpecialCasePlatformUris() {

        return Arrays.asList(

                WifiSliceBuilder.WIFI_URI,

                BluetoothSliceBuilder.BLUETOOTH_URI

                BluetoothSliceBuilder.BLUETOOTH_URI,

                LocationSliceBuilder.LOCATION_URI

        );

    }

src/com/android/settings/wifi/WifiSliceBuilder.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.settings.wifi; 
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;

import static android.provider.SettingsSlicesContract.KEY_WIFI;



import static androidx.slice.builders.ListBuilder.ICON_IMAGE;



import android.annotation.ColorInt;

import android.app.PendingIntent;

import android.content.ContentResolver;