am 2a3e1ffd: Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev (ff363aa9) · Commits · e / os / android_frameworks_base

core/java/android/app/LauncherActivity.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -440,13 +440,20 @@ public abstract class LauncherActivity extends ListActivity {
	return mPackageManager.queryIntentActivities(queryIntent, /* no flags */ 0);		return mPackageManager.queryIntentActivities(queryIntent, /* no flags */ 0);
	}		}

			/**
			* @hide
			*/
			protected void onSortResultList(List<ResolveInfo> results) {
			Collections.sort(results, new ResolveInfo.DisplayNameComparator(mPackageManager));
			}

	/**		/**
	* Perform the query to determine which results to show and return a list of them.		* Perform the query to determine which results to show and return a list of them.
	*/		*/
	public List<ListItem> makeListItems() {		public List<ListItem> makeListItems() {
	// Load all matching activities and sort correctly		// Load all matching activities and sort correctly
	List<ResolveInfo> list = onQueryPackageManager(mIntent);		List<ResolveInfo> list = onQueryPackageManager(mIntent);
	Collections.sort(list, new ResolveInfo.DisplayNameComparator(mPackageManager));		onSortResultList(list);

	ArrayList<ListItem> result = new ArrayList<ListItem>(list.size());		ArrayList<ListItem> result = new ArrayList<ListItem>(list.size());
	int listSize = list.size();		int listSize = list.size();

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -386,10 +386,9 @@ public final class Settings {

	/**		/**
	* Activity Action: Show settings to allow configuration of application		* Activity Action: Show settings to allow configuration of application
	* development-related settings.		* development-related settings. As of
	* <p>		* {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} this action is
	* In some cases, a matching Activity may not exist, so ensure you safeguard		* a required part of the platform.
	* against this.
	* <p>		* <p>
	* Input: Nothing.		* Input: Nothing.
	* <p>		* <p>