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

Merge "Fix regulatory information dialog appearance" into jb-mr1-dev

Browse Source
This commit is contained in:
Brian Muramatsu
2012-09-19 15:40:56 -07:00
committed by Android (Google) Code Review
parent ee9ecf0ac6 b585c62811
commit 801a1588d9
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/RegulatoryInfoFragment.java → src/com/android/settings/RegulatoryInfoPreference.java
View File

@@ -16,24 +16,19 @@
package com.android.settings;
import android.app.DialogFragment;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.settings.R;
import android.content.Context;
import android.preference.DialogPreference;
import android.util.AttributeSet;
/**
* {@link DialogFragment} that displays regulatory information.
* "About phone" will show a preference that displays this fragment when
* clicked if R.bool.config_show_regulatory_info is true.
* {@link DialogPreference} that displays regulatory information. "About phone"
* will show a "Regulatory information" preference if
* R.bool.config_show_regulatory_info is true.
*/
public class RegulatoryInfoFragment extends DialogFragment {
public class RegulatoryInfoPreference extends DialogPreference {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.regulatory_info, container, false);
public RegulatoryInfoPreference(Context context, AttributeSet attrs) {
super(context, attrs, com.android.internal.R.attr.preferenceStyle);
setDialogLayoutResource(R.layout.regulatory_info);
}
}