Set panel launch mode to singleInstance to avoid panel can show up infinite time when user keep launching panels (Easy repro by pressing volume hard key > settings again and again). After changing launch mode to singleInstance, we will need to do some refactors, to avoid weirdness when adding/changing/closing panels: 1. Move and refactor logic in SettingsPanelActivity#onCreate. We will need onNewIntent here to handle Panel launching, since we only have one instance of SettingsPanelActivity now. Also do refactor here to reuse the PanelFragment instead of creating one every single time, to better handle the exit animation, avoid janky exit behavior from the old PanelFragment 2. Move logic from PanelFragment#onCreateView, to reuse it when updating panel content. Also add exiting animation when we are transitioning the panel from one to another. Also add alpha animation to make it move more smoothly. 3. Adding flags to launch see more intent in settings. Fixes: 131225920 Fixes: 131254399 Test: manual Change-Id: I93d3708bd02a2d736e38685475f2d9988ef62d31
75 lines
2.1 KiB
Java
75 lines
2.1 KiB
Java
/*
|
|
* 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.panel;
|
|
|
|
import android.app.settings.SettingsEnums;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.net.Uri;
|
|
import android.provider.Settings;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.slices.CustomSliceRegistry;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Represents the Internet Connectivity Panel.
|
|
*
|
|
* <p>
|
|
* Displays Wifi (full Slice) and Airplane mode.
|
|
* </p>
|
|
*/
|
|
public class InternetConnectivityPanel implements PanelContent {
|
|
|
|
private final Context mContext;
|
|
|
|
public static InternetConnectivityPanel create(Context context) {
|
|
return new InternetConnectivityPanel(context);
|
|
}
|
|
|
|
private InternetConnectivityPanel(Context context) {
|
|
mContext = context.getApplicationContext();
|
|
}
|
|
|
|
@Override
|
|
public CharSequence getTitle() {
|
|
return mContext.getText(R.string.internet_connectivity_panel_title);
|
|
}
|
|
|
|
@Override
|
|
public List<Uri> getSlices() {
|
|
final List<Uri> uris = new ArrayList<>();
|
|
uris.add(CustomSliceRegistry.WIFI_SLICE_URI);
|
|
uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI);
|
|
uris.add(CustomSliceRegistry.AIRPLANE_URI);
|
|
return uris;
|
|
}
|
|
|
|
@Override
|
|
public Intent getSeeMoreIntent() {
|
|
return new Intent(Settings.ACTION_WIRELESS_SETTINGS)
|
|
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
}
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return SettingsEnums.PANEL_INTERNET_CONNECTIVITY;
|
|
}
|
|
}
|