LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 846fe415: am 77201b54: Rename UserId to UserHandle.

Browse Source 
* commit '846fe415350bd0668f8a2190d1c78cf07c97ef60':
  Rename UserId to UserHandle.
This commit is contained in:
Dianne Hackborn
2012-08-16 12:53:44 -07:00
committed by Android Git Automerger
parent 1643406d85 846fe41535
commit 758a8ccd5c
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/monkey/src/com/android/commands/monkey/Monkey.java
View File

@@ -32,7 +32,7 @@ import android.os.ServiceManager;
import android.os.StrictMode; import android.os.StrictMode;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserId; import android.os.UserHandle;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.Surface; import android.view.Surface;
@@ -953,7 +953,7 @@ public class Monkey {
intent.addCategory(category); intent.addCategory(category);
} }
List<ResolveInfo> mainApps = mPm.queryIntentActivities(intent, null, 0, List<ResolveInfo> mainApps = mPm.queryIntentActivities(intent, null, 0,
UserId.myUserId()); UserHandle.myUserId());
if (mainApps == null || mainApps.size() == 0) { if (mainApps == null || mainApps.size() == 0) {
System.err.println("// Warning: no activities found for category " + category); System.err.println("// Warning: no activities found for category " + category);
continue; continue;

6
cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkViews.java
View File

@@ -24,7 +24,7 @@ import android.content.pm.IPackageManager;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserId; import android.os.UserHandle;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
@@ -140,7 +140,7 @@ public class MonkeySourceNetworkViews {
try { try {
AccessibilityNodeInfo node = event.getSource(); AccessibilityNodeInfo node = event.getSource();
String packageName = node.getPackageName().toString(); String packageName = node.getPackageName().toString();
ApplicationInfo appInfo = sPm.getApplicationInfo(packageName, 0, UserId.myUserId()); ApplicationInfo appInfo = sPm.getApplicationInfo(packageName, 0, UserHandle.myUserId());
Class<?> klass; Class<?> klass;
klass = getIdClass(packageName, appInfo.sourceDir); klass = getIdClass(packageName, appInfo.sourceDir);
return klass.getField(stringId).getInt(null); return klass.getField(stringId).getInt(null);
@@ -195,7 +195,7 @@ public class MonkeySourceNetworkViews {
String packageName = node.getPackageName().toString(); String packageName = node.getPackageName().toString();
try{ try{
Class<?> klass; Class<?> klass;
ApplicationInfo appInfo = sPm.getApplicationInfo(packageName, 0, UserId.myUserId()); ApplicationInfo appInfo = sPm.getApplicationInfo(packageName, 0, UserHandle.myUserId());
klass = getIdClass(packageName, appInfo.sourceDir); klass = getIdClass(packageName, appInfo.sourceDir);
StringBuilder fieldBuilder = new StringBuilder(); StringBuilder fieldBuilder = new StringBuilder();
Field[] fields = klass.getFields(); Field[] fields = klass.getFields();

6
samples/ApiDemos/src/com/example/android/apis/app/FragmentLayout.java
View File

@@ -150,7 +150,11 @@ public class FragmentLayout extends Activity {
// Execute a transaction, replacing any existing fragment // Execute a transaction, replacing any existing fragment
// with this one inside the frame. // with this one inside the frame.
FragmentTransaction ft = getFragmentManager().beginTransaction(); FragmentTransaction ft = getFragmentManager().beginTransaction();
ft.replace(R.id.details, details); if (index == 0) {
ft.replace(R.id.details, details);
} else {
ft.replace(R.id.a_item, details);
}
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
ft.commit(); ft.commit();
} }

6
samples/Support4Demos/src/com/example/android/supportv4/app/FragmentLayoutSupport.java
View File

@@ -153,7 +153,11 @@ public class FragmentLayoutSupport extends FragmentActivity {
// Execute a transaction, replacing any existing fragment // Execute a transaction, replacing any existing fragment
// with this one inside the frame. // with this one inside the frame.
FragmentTransaction ft = getFragmentManager().beginTransaction(); FragmentTransaction ft = getFragmentManager().beginTransaction();
ft.replace(R.id.details, details); if (index == 0) {
ft.replace(R.id.details, details);
} else {
ft.replace(R.id.a_item, details);
}
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
ft.commit(); ft.commit();
} }