8557 Commits

Author SHA1 Message Date
Robert Greenwalt
9396f6e069 Merge "Clean up APN notifications." 2010-06-09 17:11:05 -07:00
Robert Greenwalt
02648a4b84 Clean up APN notifications.
Add APNType info to notifications so you can tell what's happening.  Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42
2010-06-09 16:52:01 -07:00
Jean-Baptiste Queru
e4031a3780 am 030b0ebe: merge from froyo-plus-aosp 2010-06-09 16:12:11 -07:00
Jean-Baptiste Queru
030b0ebebf merge from froyo-plus-aosp
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
2010-06-09 16:09:19 -07:00
Dianne Hackborn
b31e84bc45 Add Fragment option menu APIs.
Also fix up how transactions are handled so that a series of transactions
can correctly be created and committed.

Change-Id: I948ba47d49e9b2246a1958bd9eac9dd36dc5a855
2010-06-09 12:26:29 -07:00
The Android Open Source Project
c08fd46f5c merge from open-source master
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
2010-06-09 12:17:03 -07:00
The Android Open Source Project
3c259d3247 merge from open-source master
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
2010-06-09 12:14:58 -07:00
Derek Sollenberger
369aca27ec Consolidate common zoom code and tighten access to some ZoomManager variables.
This is a single CL in a series of CL's that is focused on moving the
zoom logic from WebView to ZoomManager.

Change-Id: I741fc34d5dd481b89f6e0b33503834c33f4fe69e
http://b/2671604
2010-06-09 14:11:59 -04:00
Jean-Baptiste Queru
9226a713ff Merge "Adding mimetypes to the mimetype map used in the web view" 2010-06-09 10:51:16 -07:00
Viktor Yakovel
964be41e9e Fix incorrect calculation of start and end indices of changed text
- The problem is taht the calculation of indices does not take the
  difference in original and modified text lengths into account.
- If reportExtractedText() is called from the onDraw() function,
  mInputMethodState is not reset.

The error can occur when the user is editing formatted text using a full screen editor.
One example of formatted text is phone numbers (e.g. dashes are added to North American
numbers by the PhoneNumberFormattingTextWatcher class).
If the two first digits are removed from the number 555-666-777, the new number becomes 566--777.
This is due incorrect calculation of start and end indices of the changed text. The error is in
the TextView class and the problem is that the calculation does not take the difference in original
and modified text lengths into account.

Change-Id: If12d0f571873a6f1874102377432affb64ee21e8
2010-06-09 09:14:37 -07:00
Derek Sollenberger
293c360ffe Move pinch-to-zoom logic into ZoomManager.
This CL is one in a series of CL's that moves the zoom logic
from WebView into ZoomManager.

Change-Id: I9980dd78dbc3345d465d4f39afcfd2f025f45bcb
http://b/2671604
2010-06-09 11:53:10 -04:00
The Android Open Source Project
6ac4e4c755 merge from open-source master
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
2010-06-09 07:14:36 -07:00
Konstantin Lopyrev
c857740f24 Adding support for minimum number of non letter characters.
Change-Id: If54cb7209d65eef826d474d7e0dbbef63d2f2b47
2010-06-08 19:06:11 -07:00
Adam Powell
db479c9af0 Merge "Dropdown mode for ActionBar; style and API updates" 2010-06-08 17:27:09 -07:00
Jim Miller
1a0ce1cc6f am db603bb5: am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:37:12 -07:00
Jim Miller
3b68548da6 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:26 -07:00
Jim Miller
c19dade5a4 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:22 -07:00
Jim Miller
75b6a6b972 Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:31:32 -07:00
Jim Miller
284b62e1b8 Fix 2737842: Disable KeguardManager API if device policy is enabled
This change adds notification to find out when the device policy
has changed.  When an admin adds or changes a policy, we get notified
and reset the state of keyguard to be enabled.

It also moves disabling keyguard into the TokenWatcher.acquired()
method to avoid disabling keyguard when a policy doesn't permit it.
This avoids reference counting issues in TokenWatcher and hence relieves
the ordering issue.

There is one remaining caveat. An application that uses KeyguardManager
to disable keyguard will need to disable keyguard again after any
policy change.

Tested:

Install and run app that disables keyguard with no admin. Result: keyguard is enabled/disabled as expected.
Enable admin and set quality = "something" after installing & running app. Result: keyguard is enabled.
Change admin password quality to "unspecified" and re-run app (per caveat). Result: keyguard is disabled.
Change admin password quality to "something" again. Result: keyguard is enabled.
Disable admin : Result: keyguard is enabled until app runs again (per caveat).

Added minor cosmetic changes after review.

Change-Id: I302f2b01446bf031f746b0f3e8b5fd7a6cc0e648
2010-06-08 15:47:52 -07:00
Jean-Baptiste Queru
32d0d8fcc8 Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend" 2010-06-08 15:43:02 -07:00
Adam Powell
a408291e22 Dropdown mode for ActionBar; style and API updates 2010-06-08 14:25:24 -07:00
The Android Open Source Project
4bd6940c57 merge from open-source master
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
2010-06-08 13:17:41 -07:00
Romain Guy
8d49cd77df am c62c4c8b: am 804d0496: am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 2010-06-08 13:05:31 -07:00
Romain Guy
6a102b4bc7 am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
2010-06-08 13:01:05 -07:00
Romain Guy
804d04969d am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
2010-06-08 13:00:30 -07:00
Romain Guy
71d73a0dfc Merge "Add a method to hide/show a SurfaceView's surface." into froyo 2010-06-08 12:59:36 -07:00
Brad Fitzpatrick
37d33a546b am 599f7287: am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:40:57 -07:00
Brad Fitzpatrick
44dc76a8a7 Log.wtf when databases go to be downgraded.
BUG=2734435

Change-Id: I686d6d9415f3081544c3fbe379287c31e0ecec20
2010-06-08 12:20:51 -07:00
Romain Guy
afc3e11f10 Add a method to hide/show a SurfaceView's surface.
This can be used to move a surface offscreen to avoid the cost of compositing it.
This preserves the window and therefore the OpenGL context when used in h/w
accelerated apps.

Change-Id: I280295376601b17989d0fc8a271af66650016f09
2010-06-08 11:34:43 -07:00
Jean-Baptiste Queru
e6c2b8d6bd Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https." 2010-06-08 10:19:51 -07:00
Jim Miller
1a4ebd42e2 am cfa2d7c9: am 700a9506: am cb52cb52: Fix SDK build. 2010-06-08 10:15:27 -07:00
Jim Miller
aed22d27bb am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-08 10:15:21 -07:00
Jim Miller
700a95068e am cb52cb52: Fix SDK build.
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
2010-06-07 21:23:53 -07:00
Jim Miller
5d0cc81a34 am cb52cb52: Fix SDK build.
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into froyo-plus-aosp

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
2010-06-07 21:23:33 -07:00
Jim Miller
cb52cb5225 Fix SDK build.
On branch fix_sdk
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   core/java/android/app/KeyguardManager.java

Change-Id: I56848db098822536f0ac32efc8f0eb1d725bf6f9
2010-06-07 21:19:16 -07:00
Jim Miller
c4e37ac0ea am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
2010-06-07 19:26:28 -07:00
Jim Miller
7d70358a03 am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
2010-06-07 19:25:49 -07:00
Jim Miller
d6b5705e18 Fix 2737842: disable keyguard API when device policy is enabled.
This fix disables KeyguardManager's enable/disable API when any
device policy admin requests a policy that enforces a password.

Change-Id: Idb1da16b14ed8963142f7b1f62d2b060d84ffa65
2010-06-07 19:19:29 -07:00
Adam Powell
1f60aaf5c5 Merge "Fix bug 2747634 - Crash on selecting wifi" 2010-06-07 15:13:47 -07:00
Dan Egnor
2782a3de2c Merge "Add support for logging curl commands for binary POST data" 2010-06-07 14:53:00 -07:00
Jaikumar Ganesh
e6692f0f69 am a182e12b: am 526f2ff1: Merge "Serialize all commands for a particular profile." into kraken 2010-06-07 14:13:24 -07:00
Jaikumar Ganesh
daa595e733 am 8984d144: am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken 2010-06-07 14:13:19 -07:00
Jaikumar Ganesh
7de1392fc8 am eee1376c: am e50ab5f9: Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken 2010-06-07 14:13:14 -07:00
Jaikumar Ganesh
526f2ff1a5 Merge "Serialize all commands for a particular profile." into kraken 2010-06-07 14:10:08 -07:00
Jaikumar Ganesh
a8c2514edd Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken 2010-06-07 14:09:49 -07:00
Jaikumar Ganesh
e50ab5f94c Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken 2010-06-07 14:09:39 -07:00
Jaikumar Ganesh
f1048cdb68 Serialize all commands for a particular profile.
Change-Id: I843ea9ab0bb2372c8316e99e8c083a9939ad774a
2010-06-07 14:08:38 -07:00
Dmitri Plotnikov
7e8612ae0f Merge "Contact directory (GAL) API proposal." 2010-06-07 14:01:31 -07:00
Dianne Hackborn
f8a450f62d am 7d75a66c: am b7bb3b3d: Fix bug in reporting a processes\'s dependent component. 2010-06-07 12:54:04 -07:00
Adam Powell
68464a9599 Fix bug 2747634 - Crash on selecting wifi
Allow Spinner to call setAdapter during superclass construction.

Change-Id: Ia57d231249b28de3809d7ee09a77277eac1553ca
2010-06-07 12:48:07 -07:00