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

Merge "Fix AppDetails padding on tablet UI" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-21 17:53:44 +00:00
committed by Android (Google) Code Review
parent 724ec85e12 38ba9a2d43
commit 6d26c17380
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/Utils.java
View File

@@ -390,6 +390,15 @@ public final class Utils {
}
}
public static void forceCustomPadding(View view) {
final Resources res = view.getResources();
final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin);
final int paddingBottom = res.getDimensionPixelSize(
com.android.internal.R.dimen.preference_fragment_padding_bottom);
view.setPaddingRelative(paddingSide, 0, paddingSide, paddingBottom);
}
/**
* Return string resource that best describes combination of tethering
* options available on this device.

24
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -452,17 +452,19 @@ public class InstalledAppDetails extends Fragment
public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.installed_app_details, container, false);
Utils.prepareCustomPreferencesList(container, view, view, false);
final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
Utils.forceCustomPadding(allDetails);
mRootView = view;
mComputingStr = getActivity().getText(R.string.computing_size);
// Set default values on sizes
mTotalSize = (TextView)view.findViewById(R.id.total_size_text);
mAppSize = (TextView)view.findViewById(R.id.application_size_text);
mDataSize = (TextView)view.findViewById(R.id.data_size_text);
mExternalCodeSize = (TextView)view.findViewById(R.id.external_code_size_text);
mExternalDataSize = (TextView)view.findViewById(R.id.external_data_size_text);
mTotalSize = (TextView) view.findViewById(R.id.total_size_text);
mAppSize = (TextView) view.findViewById(R.id.application_size_text);
mDataSize = (TextView) view.findViewById(R.id.data_size_text);
mExternalCodeSize = (TextView) view.findViewById(R.id.external_code_size_text);
mExternalDataSize = (TextView) view.findViewById(R.id.external_data_size_text);
if (Environment.isExternalStorageEmulated()) {
((View)mExternalCodeSize.getParent()).setVisibility(View.GONE);
@@ -473,13 +475,13 @@ public class InstalledAppDetails extends Fragment
View btnPanel = view.findViewById(R.id.control_buttons_panel);
mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
mForceStopButton.setText(R.string.force_stop);
mUninstallButton = (Button)btnPanel.findViewById(R.id.right_button);
mUninstallButton = (Button) btnPanel.findViewById(R.id.right_button);
mForceStopButton.setEnabled(false);
// Get More Control button panel
mMoreControlButtons = view.findViewById(R.id.more_control_buttons_panel);
mMoreControlButtons.findViewById(R.id.left_button).setVisibility(View.INVISIBLE);
mSpecialDisableButton = (Button)mMoreControlButtons.findViewById(R.id.right_button);
mSpecialDisableButton = (Button) mMoreControlButtons.findViewById(R.id.right_button);
mMoreControlButtons.setVisibility(View.GONE);
// Initialize clear data and move install location buttons
@@ -491,12 +493,12 @@ public class InstalledAppDetails extends Fragment
mCacheSize = (TextView) view.findViewById(R.id.cache_size_text);
mClearCacheButton = (Button) view.findViewById(R.id.clear_cache_button);
mActivitiesButton = (Button)view.findViewById(R.id.clear_activities_button);
mActivitiesButton = (Button) view.findViewById(R.id.clear_activities_button);
// Screen compatibility control
mScreenCompatSection = view.findViewById(R.id.screen_compatibility_section);
mAskCompatibilityCB = (CheckBox)view.findViewById(R.id.ask_compatibility_cb);
mEnableCompatibilityCB = (CheckBox)view.findViewById(R.id.enable_compatibility_cb);
mAskCompatibilityCB = (CheckBox) view.findViewById(R.id.ask_compatibility_cb);
mEnableCompatibilityCB = (CheckBox) view.findViewById(R.id.enable_compatibility_cb);
mNotificationSwitch = (CompoundButton) view.findViewById(R.id.notification_switch);