PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master

Browse Source 
Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd
This commit is contained in:
Xin Li
2019-02-12 14:54:28 -08:00
parent 4d8f4919e0 98cdb732ce
commit d61c2adf09
96 changed files with 1014 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
View File

@@ -22,12 +22,12 @@ import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.FeatureFlags;
import java.util.HashSet;
import androidx.annotation.VisibleForTesting;
/**
* Helper class to get feature persistent flag information.
*/

1
src/com/android/settings/development/featureflags/FeatureFlagPreference.java
View File

@@ -21,6 +21,7 @@ import android.util.Log;
import androidx.preference.SwitchPreference;
import android.util.FeatureFlagUtils;
import android.util.Log;
public class FeatureFlagPreference extends SwitchPreference {

35
src/com/android/settings/development/qstile/DevelopmentTiles.java
View File

@@ -16,7 +16,9 @@
package com.android.settings.development.qstile;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.IBinder;
import android.os.Parcel;
import android.os.RemoteException;
@@ -27,6 +29,7 @@ import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
import android.sysprop.DisplayProperties;
import androidx.annotation.VisibleForTesting;
import android.util.EventLog;
import android.util.Log;
import android.view.IWindowManager;
import android.view.ThreadedRenderer;
@@ -35,6 +38,8 @@ import android.view.WindowManagerGlobal;
import android.widget.Toast;
import com.android.internal.app.LocalePicker;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.development.SystemPropPoker;
public abstract class DevelopmentTiles extends TileService {
@@ -51,7 +56,33 @@ public abstract class DevelopmentTiles extends TileService {
}
public void refresh() {
getQsTile().setState(isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
final int state;
if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)) {
// Reset to disabled state if dev option is off.
if (isEnabled()) {
setIsEnabled(false);
SystemPropPoker.getInstance().poke();
}
final ComponentName cn = new ComponentName(getPackageName(), getClass().getName());
try {
getPackageManager().setComponentEnabledSetting(
cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
final IStatusBarService statusBarService = IStatusBarService.Stub.asInterface(
ServiceManager.checkService(Context.STATUS_BAR_SERVICE));
if (statusBarService != null) {
EventLog.writeEvent(0x534e4554, "117770924"); // SaftyNet
statusBarService.remTile(cn);
}
} catch (RemoteException e) {
Log.e(TAG, "Failed to modify QS tile for component " +
cn.toString(), e);
}
state = Tile.STATE_UNAVAILABLE;
} else {
state = isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
}
getQsTile().setState(state);
getQsTile().updateTile();
}
@@ -242,4 +273,4 @@ public abstract class DevelopmentTiles extends TileService {
}
}
}
}
}