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

Make sure screen pinning desc is part of view hierarchy

Browse Source 
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes: 29243233
This commit is contained in:
Jason Monk
2016-06-17 10:05:06 -04:00
parent 333ba2df01
commit 0c2ccba2f9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/ScreenPinningSettings.java
View File

@@ -28,6 +28,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.Switch; import android.widget.Switch;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -65,9 +66,6 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
mLockPatternUtils = new LockPatternUtils(activity); mLockPatternUtils = new LockPatternUtils(activity);
View emptyView = LayoutInflater.from(activity)
.inflate(R.layout.screen_pinning_instructions, null);
setEmptyView(emptyView);
mSwitchBar = activity.getSwitchBar(); mSwitchBar = activity.getSwitchBar();
mSwitchBar.addOnSwitchChangeListener(this); mSwitchBar.addOnSwitchChangeListener(this);
@@ -75,6 +73,16 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
mSwitchBar.setChecked(isLockToAppEnabled(getActivity())); mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
} }
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ViewGroup parent = (ViewGroup) view.findViewById(android.R.id.list_container);
View emptyView = LayoutInflater.from(getContext())
.inflate(R.layout.screen_pinning_instructions, parent, false);
parent.addView(emptyView);
setEmptyView(emptyView);
}
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();