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

Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev

Browse Source
This commit is contained in:
Fan Zhang
2017-07-25 23:06:11 +00:00
committed by Android (Google) Code Review
parent 2f84a358d9 84dd783c36
commit 7da06bd11b
4 changed files with 163 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/widget/SwitchBar.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.widget;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Parcel;
@@ -41,8 +43,6 @@ import com.android.settingslib.RestrictedLockUtils;
import java.util.ArrayList;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
View.OnClickListener {
@@ -71,8 +71,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
private String mMetricsTag;
private ArrayList<OnSwitchChangeListener> mSwitchChangeListeners =
new ArrayList<OnSwitchChangeListener>();
private final ArrayList<OnSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
private static int[] XML_ATTRIBUTES = {
R.attr.switchBarMarginStart, R.attr.switchBarMarginEnd,