OSDN Git Service
Mathias Agopian [Mon, 6 Aug 2012 20:12:27 +0000 (13:12 -0700)]
Merge "libutils cleanup" into jb-mr1-dev
Daniel Sandler [Mon, 6 Aug 2012 18:31:13 +0000 (14:31 -0400)]
Move lots of layout-port/ resources to layout/ .
The framework is no longer letting us skate by without a
default (unqualified) for of each resource; in particular,
the land/port aspect of the configuration appears to be
binding much later than it used to.
Bug:
6937365
Change-Id: I6bf72c76e707548168fefa9466dc196ffde33ab3
Jeff Sharkey [Sun, 5 Aug 2012 21:58:13 +0000 (14:58 -0700)]
Merge "Make generic BaseNetworkObserver." into jb-mr1-dev
Jeff Sharkey [Sun, 5 Aug 2012 21:55:27 +0000 (14:55 -0700)]
Merge "Make LocalSocket Closeable." into jb-mr1-dev
Jeff Sharkey [Sun, 5 Aug 2012 21:29:23 +0000 (14:29 -0700)]
Make generic BaseNetworkObserver.
This makes it easier to add new INetworkManagementEventObserver events
in future.
Change-Id: I432263d745558de4b878f313c1951230ed9db2b1
Jeff Sharkey [Sun, 5 Aug 2012 21:16:48 +0000 (14:16 -0700)]
Make LocalSocket Closeable.
Enables usage of IoUtils.closeQuietly().
Change-Id: I91126297c1f235ae9da09f82d8f4f22db46558eb
Mathias Agopian [Sun, 5 Aug 2012 19:38:51 +0000 (12:38 -0700)]
libutils cleanup
Change-Id: Ic069539338ba4097dba9399904f02bbd0296c20e
Wink Saville [Sat, 4 Aug 2012 15:12:52 +0000 (08:12 -0700)]
am
8f82961f: am
98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
* commit '
8f82961f5ace376cb2f888f8d4e53fe8a49f7315':
Telephony: Move AdnRecord.aidl into opt/telephony
Wink Saville [Sat, 4 Aug 2012 15:12:48 +0000 (08:12 -0700)]
am
1971df5d: am
e20a19cb: Merge "show 3G icon for CDMA/1xRTT"
* commit '
1971df5d4296f077cccff704201057a32b733235':
show 3G icon for CDMA/1xRTT
Wink Saville [Sat, 4 Aug 2012 15:07:54 +0000 (08:07 -0700)]
am
98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
* commit '
98853623bcb27155e9b030301a0cb2a987cfc612':
Telephony: Move AdnRecord.aidl into opt/telephony
Wink Saville [Sat, 4 Aug 2012 15:07:49 +0000 (08:07 -0700)]
am
e20a19cb: Merge "show 3G icon for CDMA/1xRTT"
* commit '
e20a19cb541f8621f04be0f3d3501f2fc51a0e82':
show 3G icon for CDMA/1xRTT
Wink Saville [Sat, 4 Aug 2012 14:54:35 +0000 (07:54 -0700)]
Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
Wink Saville [Sat, 4 Aug 2012 14:51:26 +0000 (07:51 -0700)]
Merge "show 3G icon for CDMA/1xRTT"
Craig Mautner [Sat, 4 Aug 2012 02:03:24 +0000 (19:03 -0700)]
Fix build with density methods.
Change-Id: I95c0a4f12db40f200a3a004394763beaef904232
Craig Mautner [Sat, 4 Aug 2012 01:07:52 +0000 (18:07 -0700)]
Merge "Do not use last app rotation as default." into jb-mr1-dev
Raph Levien [Sat, 4 Aug 2012 01:00:52 +0000 (18:00 -0700)]
Merge "Fix bug
6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev
Romain Guy [Sat, 4 Aug 2012 00:46:26 +0000 (17:46 -0700)]
Merge "Bowing my head in shame Bug #
6924514" into jb-mr1-dev
Dianne Hackborn [Sat, 4 Aug 2012 00:45:52 +0000 (17:45 -0700)]
Merge "We can now (kind-of) change screen density on the fly." into jb-mr1-dev
Romain Guy [Sat, 4 Aug 2012 00:43:31 +0000 (17:43 -0700)]
Bowing my head in shame
Bug #
6924514
Change-Id: Ifcc08fb5dbaf3f9c6ac3a3e618db2fd6349dc290
Dianne Hackborn [Fri, 3 Aug 2012 21:01:57 +0000 (14:01 -0700)]
We can now (kind-of) change screen density on the fly.
Preloaded drawables now have a density associated with them, so we
can load the correct drawable if we are using a different density.
Window manager now formally keeps track of the density for each
screen, allowing it to be overridden like you can already do with
size, and relies on this density to drive itself internally and
the configurations it reports.
There are a new set of Bitmap constructors where you provide a
DisplayMetrics so they can be constructed with the correct density.
(This will be for when you can have different windows in the same
app running at different densities.)
ActivityThread now watches for density changes, and pushes them
to the DENSITY_DEVICE and Bitmap global density values for that
process.
A new am command allows you to change the density.
Romain Guy [Sat, 4 Aug 2012 00:21:04 +0000 (17:21 -0700)]
Use correct color for default holo gradient
Change-Id: I7976c8d986da69dd312fe28cc6d88fc896bdf926
Alex Yakavenka [Fri, 3 Aug 2012 17:42:41 +0000 (10:42 -0700)]
Telephony: Move AdnRecord.aidl into opt/telephony
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
Romain Guy [Fri, 3 Aug 2012 22:58:12 +0000 (15:58 -0700)]
Replace stretched background textures with real gradients
Change-Id: I320733aaef191318d32fa823d9a6140585f49417
Romain Guy [Fri, 3 Aug 2012 23:06:55 +0000 (16:06 -0700)]
Avoid crash when dumping display lists
We recently changed the drawText implementation to accept more parameters
which were not taken into account during a dump operation.
Change-Id: Ia1dc682dc7bb2bb02a1f4a514ed5af5556f92a97
Craig Mautner [Fri, 3 Aug 2012 20:54:02 +0000 (13:54 -0700)]
Do not use last app rotation as default.
If the rotation sensor has been disabled we were substituting the
last app rotation for the sensor value. This fix uses the last
sensor value delivered before the sensor was disabled. Only use
the last app rotation if we never have received a valid sensor
value.
Fixes bug
6387946.
Change-Id: I50743c30ee2b4455e9848d3a619809be97eec3c8
Raph Levien [Fri, 3 Aug 2012 21:32:39 +0000 (14:32 -0700)]
Fix bug
6930875: ArrayIndexOutOfBoundsException on Battery details
The wrong constant was used to count the number of user activity types.
The number of types changed recently, so before then nothing bad
happened. Now we get an AIOOB.
This is the change to NUM_USER_ACTIVITY_TYPES:
Change-Id: I05045180129b30fa09fe5f5e1e3b0ac25fee23b4
https://googleplex-android-review.googlesource.com/#/c/211982/
Ying Wang [Fri, 3 Aug 2012 21:31:39 +0000 (14:31 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Dianne Hackborn [Fri, 3 Aug 2012 21:11:36 +0000 (14:11 -0700)]
Merge "Fix issue #
6921726: Prime: Cannot make or receive phone calls..." into jb-mr1-dev
Dianne Hackborn [Fri, 3 Aug 2012 21:04:30 +0000 (14:04 -0700)]
Fix issue #
6921726: Prime: Cannot make or receive phone calls...
[NPE at android.graphics.drawable.Drawable.createFromResourceStream]
Change-Id: I223428ffb39e883518aad817227f32851ea18aec
The Android Open Source Project [Fri, 3 Aug 2012 20:26:58 +0000 (13:26 -0700)]
am
633233bc: (-s ours) Reconcile with jb-release - do not merge
* commit '
633233bc9ec0f3961b096fea933ecaa454214fd7':
Fix NPE on some phones at startup.
Fix
6804479: "Emergency calls only" in notification shade
Implement CMAS service category program results.
Fix detection of CDMA cell broadcast messages.
Fix our interpretation of apn setting's bearer.
The Android Open Source Project [Fri, 3 Aug 2012 20:23:27 +0000 (13:23 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I586debc586c0de8fc24359daa40cbee9e58340ab
Ying Wang [Fri, 3 Aug 2012 19:20:06 +0000 (12:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I96086039ac5b62a7a137990de380c95913e17f0f
Auto-generated-cl: translation import
Martijn Coenen [Fri, 3 Aug 2012 19:12:11 +0000 (12:12 -0700)]
Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev
The Android Open Source Project [Fri, 3 Aug 2012 19:11:54 +0000 (12:11 -0700)]
Reconcile AOSP and GOOG jb-release
Change-Id: I2cee4571848de79427356a6fcfe8da59ae34e70f
Jeff Sharkey [Fri, 3 Aug 2012 18:56:02 +0000 (11:56 -0700)]
Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev
Jeff Sharkey [Fri, 3 Aug 2012 18:53:01 +0000 (11:53 -0700)]
Pass changed NetworkInfo to LocationProvider.
LocationProviders often rely on non-default networks, so pass the
network that actually changed, instead of the default.
Bug:
6929692
Change-Id: I31d9eec792e07259282aa1bb57ec66c01962df64
Daniel Sandler [Wed, 25 Jul 2012 16:31:22 +0000 (12:31 -0400)]
Fix NPE on some phones at startup.
Bug:
6877589
Change-Id: I65ff37b4cf6b59a72a7aa665f252f5fb34f3b183
Daniel Sandler [Tue, 24 Jul 2012 19:19:04 +0000 (15:19 -0400)]
Fix
6804479: "Emergency calls only" in notification shade
Add an additional codepath to the "no connectivity" logic in
NetworkController to allow the PLMN bubble up from the
GsmServiceStateTracker, where R.string.emergency_calls_only
is returned if we're in emergency call mode.
Bug:
6804479
Change-Id: I0a77261e4393cc0dc32bae3e631ef196b2342f06
Jake Hamby [Tue, 24 Jul 2012 22:39:45 +0000 (15:39 -0700)]
Implement CMAS service category program results.
Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).
Bug:
6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
Jake Hamby [Mon, 23 Jul 2012 21:42:33 +0000 (14:42 -0700)]
Fix detection of CDMA cell broadcast messages.
The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.
Bug:
6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
Robert Greenwalt [Tue, 17 Jul 2012 21:46:34 +0000 (14:46 -0700)]
Fix our interpretation of apn setting's bearer.
Between ICS and JB we changed it to use TelephonyManager's network type
enumeration. This changes it back to represent the RIL's radio
technology. The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.
bug:
6830908
Change-Id: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
Romain Guy [Fri, 3 Aug 2012 18:09:49 +0000 (11:09 -0700)]
Merge "Add dithering to gradients" into jb-mr1-dev
Chris Wren [Fri, 3 Aug 2012 16:52:08 +0000 (09:52 -0700)]
Merge "Don't allow the status bar to collapse things we're touching." into jb-mr1-dev
John Spurlock [Fri, 3 Aug 2012 15:36:41 +0000 (08:36 -0700)]
Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev
Martijn Coenen [Fri, 3 Aug 2012 15:36:02 +0000 (08:36 -0700)]
Bluetooth: fix enableNoAutoConnect() call.
For now, just do a regular connect.
Change-Id: Ibc43098d45c82177298cb17d72a32c7904924021
John Spurlock [Fri, 3 Aug 2012 15:34:42 +0000 (08:34 -0700)]
Merge "Fix typos in android.widget package docs." into jb-mr1-dev
Craig Mautner [Fri, 3 Aug 2012 15:25:41 +0000 (08:25 -0700)]
Merge "Add features to DisplayManager." into jb-mr1-dev
John Spurlock [Fri, 3 Aug 2012 13:11:52 +0000 (09:11 -0400)]
Fix typos in android.widget package docs.
Fixed spelling errors and cleaned up markup.
Change-Id: I3573087d40bbeb3906a8361abb02de4cb4325a92
John Spurlock [Tue, 31 Jul 2012 12:28:12 +0000 (08:28 -0400)]
Re-enable dreams: frameworks/base
Enable feature in config. Expose Dream in public api for unbundled apps.
Unhide package. Add isDreaming() method to service.
Re-arrange the Dream api a bit. (use onStart as hook for subclasses).
Coordinate properly with power manager.
Replace old dock mode (don't fire old intent).
Change-Id: I1318d20cc1613e5d862f2913f2fcdc9719302cf7
Bug:
6921930
Mathias Agopian [Fri, 3 Aug 2012 04:49:25 +0000 (21:49 -0700)]
Merge "screen-off animation won't be handled by SF anymore" into jb-mr1-dev
Jeff Brown [Fri, 3 Aug 2012 04:36:32 +0000 (21:36 -0700)]
Merge "Remove unnecessary code." into jb-mr1-dev
Jeff Brown [Fri, 3 Aug 2012 04:34:46 +0000 (21:34 -0700)]
Remove unnecessary code.
Bug:
6926595
Change-Id: Ice3138675c024e9efe9c7922e1e0a05f19cdde54
Mathias Agopian [Fri, 3 Aug 2012 04:29:54 +0000 (21:29 -0700)]
screen-off animation won't be handled by SF anymore
Change-Id: I66ad02b07b1148c1610e9c29ba80450d49c22806
Dianne Hackborn [Fri, 3 Aug 2012 02:14:39 +0000 (19:14 -0700)]
Merge "Add APIs for interacting across users." into jb-mr1-dev
Madan Ankapura [Fri, 3 Aug 2012 02:10:22 +0000 (19:10 -0700)]
show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device
Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
Dianne Hackborn [Fri, 3 Aug 2012 01:31:26 +0000 (18:31 -0700)]
Add APIs for interacting across users.
- Expose the existing Context.sendBroadcast() as
Context.sendBroadcastAsUser().
- Add new android:singleUser attribute for services.
- Add new INTERACT_ACROSS_USERS_FULL permission for full
system-level access to cross-user interface (allows
sendBroadcastAsUser() to send to any receiver).
- Add new INTERACT_ACROSS_USERS_FULL permission for
more restricted cross-user interaction: this is required
for android:singleUser, and allows you to use
sendBroadcastAsUser() but only to send to your own
receivers.
Change-Id: I0de88f6718e9505f4de72e3f45d29c0f503b76e9
Adam Powell [Thu, 2 Aug 2012 23:42:01 +0000 (16:42 -0700)]
Make AutoCompleteTextView#setText(CharSequence, boolean) public
Bug
6807326
Public bug http://code.google.com/p/android/issues/detail?id=34690
Make this available for use by applications that wish to make
programmatic changes to the AutoCompleteTextView without filtering.
Change-Id: I889452d3b19b378258ad9247f3d254afee1e8408
Robert Greenwalt [Fri, 3 Aug 2012 00:26:29 +0000 (17:26 -0700)]
am
2cb7db11: resolved conflicts for merge of
41508f05 to jb-dev-plus-aosp
* commit '
2cb7db116f738b9c88f3aeceb345cbdc99de04ce':
Fix a logging NPE problem
Robert Greenwalt [Fri, 3 Aug 2012 00:15:43 +0000 (17:15 -0700)]
resolved conflicts for merge of
41508f05 to jb-dev-plus-aosp
Change-Id: I7232528f0f438ce9cf7759643631a250f545306e
George Mount [Thu, 2 Aug 2012 23:28:03 +0000 (16:28 -0700)]
Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
Svetoslav Ganov [Thu, 2 Aug 2012 23:07:35 +0000 (16:07 -0700)]
am
e1c47324: am
9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
* commit '
e1c47324fc22f86f378cb6ccc51e4554eec5156b':
Notification panel on tablet does not handle back and home key events.
Robert Greenwalt [Thu, 2 Aug 2012 23:06:56 +0000 (16:06 -0700)]
Fix a logging NPE problem
bug:
6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
Dirk Dougherty [Thu, 2 Aug 2012 22:39:55 +0000 (15:39 -0700)]
am
265eea82: am
568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '
265eea82ae24b5620dc84fa6c51ba72aca9a1cf6':
Doc change: add trademarks attribution.
Svetoslav Ganov [Thu, 2 Aug 2012 22:19:03 +0000 (15:19 -0700)]
am
9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
* commit '
9a59f6e02fdcabbf2debd5b836b01f7b22a4b21a':
Notification panel on tablet does not handle back and home key events.
Svetoslav Ganov [Thu, 2 Aug 2012 22:16:02 +0000 (15:16 -0700)]
Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
George Mount [Thu, 2 Aug 2012 22:14:39 +0000 (15:14 -0700)]
Cancel handler for JS unload handler prevents hang.
Bug
6803309
When the alert dialog raised by the JS unload handler was pressed
outside the alert region, it was canceled and no response was
sent back to WebViewCore. This captures the cancel event so that
WebViewCore doesn't hang.
Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
Jeff Brown [Thu, 2 Aug 2012 21:58:47 +0000 (14:58 -0700)]
Merge "Allow access to display manager service from isolated processes." into jb-mr1-dev
Dirk Dougherty [Thu, 2 Aug 2012 21:57:50 +0000 (14:57 -0700)]
am
568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '
568db47b770cbfaacdd54914540923258cd6f847':
Doc change: add trademarks attribution.
Brian Carlstrom [Thu, 2 Aug 2012 21:56:59 +0000 (14:56 -0700)]
am
4040fccd: am
d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
* commit '
4040fccdddcc4669b01979572c8289b2d674a711':
Change KeyStore to use Modified UTF-8 to match NativeCrypto
Brian Carlstrom [Thu, 2 Aug 2012 21:56:55 +0000 (14:56 -0700)]
am
fb64fe1b: am
4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"
* commit '
fb64fe1b6ed02f9e52694029f1efe47665353d48':
Improve test key names to reproduce public issue
Jeff Brown [Thu, 2 Aug 2012 21:55:26 +0000 (14:55 -0700)]
Allow access to display manager service from isolated processes.
Bug:
6921302
Change-Id: I9eed4a24992538e18ad0540b96a8cea2c8a9ef76
Adam Powell [Thu, 2 Aug 2012 21:53:22 +0000 (14:53 -0700)]
Merge "Fix some ActionBar menu issues around config changes" into jb-mr1-dev
Adam Powell [Thu, 2 Aug 2012 21:35:26 +0000 (14:35 -0700)]
Fix some ActionBar menu issues around config changes
Bug
6904212
Update allow-text and max item height properties for action bar menu
item views properly.
Fix an ActionMenuItemView measurement bug that could cause items to
measure too small.
Change-Id: Ibac8491f7670969b0ae4584fff5e44ebd1435abd
Craig Mautner [Thu, 2 Aug 2012 21:30:30 +0000 (14:30 -0700)]
Add features to DisplayManager.
Added Surface.setDisplayId().
Added callbacks to DisplayManagerService.
Change-Id: Idd3f85f8ca1f1208962f1196efd6a3ab51c8c259
Chris Wren [Thu, 2 Aug 2012 20:52:21 +0000 (16:52 -0400)]
Don't allow the status bar to collapse things we're touching.
Bug:
6538918
Change-Id: Ie4e79aa593ac2097d0e6402f84816df934160687
Svetoslav Ganov [Mon, 30 Jul 2012 23:13:46 +0000 (16:13 -0700)]
Notification panel on tablet does not handle back and home key events.
1. Notification panel on tablet does not handle back and home key events and
as a result the notification panel stays open. Hence, after opening the
notifications panel, pressing the back key on a keyboard will move back
in the app instead closing the panel. Same happens for the home key.
The expected behavior is if the panel is open the back button will dismiss
it and the key should be consumed by the panel. The home key should hide
the panel and the key should not be consumed by the panel so the system
can do the right thing.
bug:
6902903
Change-Id: I06e8ceea1f51b998e6703d70dcb3a24128d5a581
Dirk Dougherty [Thu, 2 Aug 2012 20:42:16 +0000 (13:42 -0700)]
Merge "Doc change: add trademarks attribution." into jb-dev
Craig Mautner [Thu, 2 Aug 2012 20:16:12 +0000 (13:16 -0700)]
Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev
rich cannings [Thu, 2 Aug 2012 19:57:11 +0000 (12:57 -0700)]
Merge "Pass URLs to package verifiers" into jb-mr1-dev
Marco Nelissen [Tue, 31 Jul 2012 22:00:12 +0000 (15:00 -0700)]
Improve scan time for some cases
When the path being matched has a sqlite wildcard character in it, a "like"
match will be quite slow. Unfortunately this is fairly common, since "_"
is a wildcard character. However, because in most cases the case of the path
in the database will match the case on disk, an "=" match will work, so it
is worthwhile to try an "=" match first, before trying a "like".
If there are no wildcard characters, the "like" will be as fast as the "=",
because of the case-insensitive index on the _data column, so there is no
need to try "=" first in that case.
b/
6751354
Change-Id: I1cd4efbd56a37886cb44a86acb73eb9a3c9f303d
Adam Powell [Thu, 2 Aug 2012 18:28:44 +0000 (11:28 -0700)]
Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev
rich cannings [Thu, 26 Jul 2012 21:07:53 +0000 (14:07 -0700)]
Pass URLs to package verifiers
This change passes the originating URL and accompanied referrer to
package verifiers, when available.
Bug:
6544677
Change-Id: If9ff6663ad7f3426b7aea2aceb1413b689788138
Adam Powell [Thu, 2 Aug 2012 17:31:30 +0000 (10:31 -0700)]
Make MediaRouteButton focusable by default
Bug
6921236
Add a default contentDescription for MediaRouteButton.
Add long-press "cheat sheet" support to MediaRouteButtons created by
MediaRouteActionProvider for use in the action bar to match standard
action button behavior.
Change-Id: I313cfcb2349210765b084c3388095de4624009e8
Craig Mautner [Thu, 2 Aug 2012 18:23:00 +0000 (11:23 -0700)]
Refactor DisplayManagerService to be functional.
Change-Id: Ieac1eca172be5dc5db45302d3afa26188acd4d6d
George Mount [Thu, 2 Aug 2012 18:15:11 +0000 (11:15 -0700)]
Merge "Don't restart input in the middle of a batch." into jb-mr1-dev
Chris Wren [Thu, 2 Aug 2012 18:09:20 +0000 (11:09 -0700)]
Merge "Venetian blinds policy for one-finger notification expansion." into jb-mr1-dev
Brian Carlstrom [Thu, 2 Aug 2012 17:32:13 +0000 (10:32 -0700)]
am
d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
* commit '
d2237dfe7d84c36e5cc9399a444f9befb559af97':
Change KeyStore to use Modified UTF-8 to match NativeCrypto
Brian Carlstrom [Thu, 2 Aug 2012 17:32:02 +0000 (10:32 -0700)]
am
4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"
* commit '
4faeef378e9b82a4ad0fc1d4bb923af1a4f70e4e':
Improve test key names to reproduce public issue
Scott Main [Thu, 2 Aug 2012 17:31:44 +0000 (10:31 -0700)]
am
80adeb53: am
5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '
80adeb535f17331dedbbd200c99c366f34d33eeb':
fix markup for gl pie
Katie McCormick [Thu, 2 Aug 2012 17:31:36 +0000 (10:31 -0700)]
am
27ed953f: (-s ours) am
9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '
27ed953f63f179b6be5a01425bf84df1dd934350':
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.
Chris Wren [Wed, 1 Aug 2012 21:03:07 +0000 (17:03 -0400)]
Venetian blinds policy for one-finger notification expansion.
Bug:
6538918
Change-Id: I8a6f860684b2477571f69eb4a79a5c106251b1a8
George Mount [Wed, 1 Aug 2012 22:11:13 +0000 (15:11 -0700)]
Don't restart input in the middle of a batch.
Bug
6854156
setComposingText is in the middle of a batch and it was resetting
the InputConnection. When the batch ended, it was closing a
batch that wasn't open on the new InputConnection. The reset
turns out not to be necessary anymore -- the LatinIME respects
the content when setComposingText fails to change anything.
Change-Id: If3352b32ed7b3c90c8dcb3d5ff8d308e82849d85
Dirk Dougherty [Wed, 1 Aug 2012 20:49:11 +0000 (13:49 -0700)]
Doc change: add trademarks attribution.
Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
Craig Mautner [Thu, 2 Aug 2012 16:20:14 +0000 (09:20 -0700)]
Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev
Craig Mautner [Mon, 30 Jul 2012 19:10:24 +0000 (12:10 -0700)]
Introduce multiple displays with DisplayContent.
Fix a couple of bugs that turned up.
Remove touch/focus from display. Add iterators for access.
Respond to comments. Remove TODOs, and some deviceId parameters.
Change-Id: Idcdb4f1979aa7b14634d450fd0333d6eff26994d
Romain Guy [Wed, 1 Aug 2012 04:16:07 +0000 (21:16 -0700)]
Add dithering to gradients
Change-Id: Ic1208855bde3a254eca2fd7cef43e0f1318ce419
Dianne Hackborn [Thu, 2 Aug 2012 02:05:52 +0000 (19:05 -0700)]
Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev
Dianne Hackborn [Thu, 2 Aug 2012 02:00:38 +0000 (19:00 -0700)]
Add API to turn on HW drawing in IMEs.
Change-Id: Ib6a8bda46223ce1153f32834daf02a820d16136e
Jason Sams [Thu, 2 Aug 2012 01:37:36 +0000 (18:37 -0700)]
Merge "Vignette filter: precompute more values, simplify math, cleanup code" into jb-mr1-dev
Scott Main [Thu, 2 Aug 2012 00:04:58 +0000 (17:04 -0700)]
am
5ae754c9: Merge "fix markup for gl pie" into jb-dev
* commit '
5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
fix markup for gl pie