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

Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-09-18 15:15:31 -07:00
committed by Android (Google) Code Review
parent a6c1b346ae fda48e39d3
commit 220b06b1bb
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DataUsageSummary.java
View File

@@ -461,7 +461,7 @@ public class DataUsageSummary extends Fragment {
mMenuAutoSync = menu.findItem(R.id.data_usage_menu_auto_sync);
mMenuAutoSync.setChecked(ContentResolver.getMasterSyncAutomatically());
mMenuAutoSync.setVisible(isOwner && !appDetailMode);
mMenuAutoSync.setVisible(!appDetailMode);
final MenuItem split4g = menu.findItem(R.id.data_usage_menu_split_4g);
split4g.setVisible(hasReadyMobile4gRadio(context) && isOwner && !appDetailMode);

14
src/com/android/settings/deviceinfo/FileItemInfoLayout.java
View File

@@ -2,10 +2,9 @@
package com.android.settings.deviceinfo;
import com.android.settings.R;
import android.content.Context;
import android.os.Environment;
import android.os.Environment.UserEnvironment;
import android.os.UserHandle;
import android.util.AttributeSet;
import android.view.ViewDebug;
import android.widget.CheckBox;
@@ -13,6 +12,8 @@ import android.widget.Checkable;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.android.settings.R;
/**
* Handles display of a single row entry on Settings --> Storage --> Misc Files screen
*/
@@ -20,8 +21,9 @@ public class FileItemInfoLayout extends RelativeLayout implements Checkable {
private TextView mFileNameView;
private TextView mFileSizeView;
private CheckBox mCheckbox;
private static final int mLengthExternalStorageDirPrefix =
Environment.getExternalStorageDirectory().getAbsolutePath().length() + 1;
private static final int sLengthExternalStorageDirPrefix = new UserEnvironment(
UserHandle.myUserId()).getExternalStorageDirectory().getAbsolutePath().length() + 1;
public FileItemInfoLayout(Context context) {
this(context, null);
@@ -51,7 +53,7 @@ public class FileItemInfoLayout extends RelativeLayout implements Checkable {
}
public void setFileName(String fileName) {
mFileNameView.setText(fileName.substring(mLengthExternalStorageDirPrefix));
mFileNameView.setText(fileName.substring(sLengthExternalStorageDirPrefix));
}
public void setFileSize(String filesize) {