diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Intent.java | 9 | ||||
| -rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Telephony.java | 5 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 14 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 6 |
5 files changed, 29 insertions, 7 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 7154aee..7242803 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -5267,7 +5267,14 @@ public class Intent implements Parcelable, Cloneable { b.append(' '); } first = false; - b.append("dat=").append(mData); + b.append("dat="); + if (mData.getScheme().equalsIgnoreCase("tel")) { + b.append("tel:xxx-xxx-xxxx"); + } else if (mData.getScheme().equalsIgnoreCase("smsto")) { + b.append("smsto:xxx-xxx-xxxx"); + } else { + b.append(mData); + } } if (mType != null) { if (!first) { diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index f9a1637..e1a9dbb 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/core/java/android/content/SyncStorageEngine.java @@ -411,7 +411,7 @@ public class SyncStorageEngine extends Handler { } public void setSyncAutomatically(Account account, String providerName, boolean sync) { - Log.d(TAG, "setSyncAutomatically: " + account + ", provider " + providerName + Log.d(TAG, "setSyncAutomatically: " + /*account +*/ ", provider " + providerName + " -> " + sync); synchronized (mAuthorities) { AuthorityInfo authority = getOrCreateAuthorityLocked(account, providerName, -1, false); diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index bf9e854..6d8bd9b 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1205,9 +1205,8 @@ public final class Telephony { } Uri uri = uriBuilder.build(); - if (DEBUG) { - Log.v(TAG, "getOrCreateThreadId uri: " + uri); - } + //if (DEBUG) Log.v(TAG, "getOrCreateThreadId uri: " + uri); + Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(), uri, ID_PROJECTION, null, null, null); if (DEBUG) { diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 5be52c4..6dcf4e6 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -92,6 +92,7 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.ViewDebug; +import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.ViewParent; import android.view.ViewRoot; @@ -6852,8 +6853,17 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } private void prepareCursorControllers() { + boolean windowSupportsHandles = false; + + ViewGroup.LayoutParams params = getRootView().getLayoutParams(); + if (params instanceof WindowManager.LayoutParams) { + WindowManager.LayoutParams windowParams = (WindowManager.LayoutParams) params; + windowSupportsHandles = windowParams.type < WindowManager.LayoutParams.FIRST_SUB_WINDOW + || windowParams.type > WindowManager.LayoutParams.LAST_SUB_WINDOW; + } + // TODO Add an extra android:cursorController flag to disable the controller? - if (mCursorVisible && mLayout != null) { + if (windowSupportsHandles && mCursorVisible && mLayout != null) { if (mInsertionPointCursorController == null) { mInsertionPointCursorController = new InsertionPointCursorController(); } @@ -6861,7 +6871,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mInsertionPointCursorController = null; } - if (textCanBeSelected() && mLayout != null) { + if (windowSupportsHandles && textCanBeSelected() && mLayout != null) { if (mSelectionModifierCursorController == null) { mSelectionModifierCursorController = new SelectionModifierCursorController(); } diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 849c564..99fc5c2 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -149,9 +149,15 @@ Software implementation will be used if config_hardware_auto_brightness_available is not set --> <bool name="config_automatic_brightness_available">false</bool> + <!-- Don't name config resources like this. It should look like config_annoyDianne --> + <bool name="config_annoy_dianne">true</bool> + <!-- If this is true, the screen will come on when you unplug usb/power/whatever. --> <bool name="config_unplugTurnsOnScreen">false</bool> + <!-- If this is true, the screen will fade off. --> + <bool name="config_animateScreenLights">true</bool> + <!-- XXXXXX END OF RESOURCES USING WRONG NAMING CONVENTION --> <!-- The number of degrees to rotate the display when the keyboard is open. --> |