Nicolas Klein
759c1005b3
Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
2012-11-30 14:51:43 -08:00
Nicolas Klein
9f6cb87522
Fix some typos and missing @param in android.os.Bundle
...
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.
Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
2012-11-30 14:41:46 -08:00
Robert Ly
f701090df6
am deab6fd2: am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev
...
* commit 'deab6fd2e8bd94c8449fdc2c926f7973c5661b30':
docs: gms fixes
2012-11-30 14:40:40 -08:00
Robert Ly
deab6fd2e8
am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev
...
* commit 'b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
docs: gms fixes
2012-11-30 14:38:18 -08:00
Robert Ly
b67ab7ccd6
am 648de548: Merge "docs: gms fixes" into jb-mr1-dev
...
* commit '648de5483b20bd80bda267a4430daca2ae0b089a':
docs: gms fixes
2012-11-30 14:35:48 -08:00
Robert Ly
648de5483b
Merge "docs: gms fixes" into jb-mr1-dev
2012-11-30 14:31:43 -08:00
Andreas Huber
800c8ab68d
am 2644494a: Merge changes I8462f040,Ie471f40f
...
* commit '2644494a9841c1f842d790b60911699f09eb63d1':
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
2012-11-30 14:26:16 -08:00
Andreas Huber
2644494a98
Merge changes I8462f040,Ie471f40f
...
* changes:
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
2012-11-30 13:26:51 -08:00
John Spurlock
368016f769
am bd0e1808: am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev
...
* commit 'bd0e180893c33f6958d4940709687ef2a52e8336':
Only show camera widget to setup users.
2012-11-30 13:26:47 -08:00
John Spurlock
bd0e180893
am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev
...
* commit '4015c3f815fa83e67aa72d2c474e7e6f4c2dd5d0':
Only show camera widget to setup users.
2012-11-30 13:24:39 -08:00
Daniel Sandler
57b47ae95d
am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
Add constant for Daydream settings.
2012-11-30 13:22:03 -08:00
Robert Ly
c9c948ba49
am 50246b5b: am 861c55ff: am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
...
* commit '50246b5bc637b166aca1ca188c465800506fc2e3':
docs: add correct toc for google reference
2012-11-30 13:22:00 -08:00
Robert Ly
6decbd92b4
am 849cef07: am 1c92ce10: am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
...
* commit '849cef07389517f3d08c1217c7c4e004ac5f2636':
Revert "docs: gms javadocs"
2012-11-30 13:21:56 -08:00
Svetoslav Ganov
d902dbb2ea
am ed734d98: am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit 'ed734d98d014945cf28aa5e49ba1fd2ff5c82c01':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:21:53 -08:00
Jason Sams
98a09c64d5
am 43174b7d: am 718fb9f1: Fix sample code issues
...
* commit '43174b7d2250d5afecabd5a97d2f7fbddc753fd7':
Fix sample code issues
2012-11-30 13:21:50 -08:00
John Spurlock
4015c3f815
Merge "Only show camera widget to setup users." into jb-mr1.1-dev
2012-11-30 13:20:09 -08:00
Daniel Sandler
9e129f37b6
am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
Add constant for Daydream settings.
2012-11-30 13:17:22 -08:00
Robert Ly
50246b5bc6
am 861c55ff: am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
...
* commit '861c55ffcc854563f4adec0b094c1b6948c72036':
docs: add correct toc for google reference
2012-11-30 13:17:15 -08:00
Robert Ly
849cef0738
am 1c92ce10: am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
...
* commit '1c92ce10b5123bc374f8cba2c61c4c56f9d4f319':
Revert "docs: gms javadocs"
2012-11-30 13:17:11 -08:00
Svetoslav Ganov
ed734d98d0
am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '0e7adaff99778c596bfd3f4c1e42710592c472a2':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:17:08 -08:00
Jason Sams
43174b7d22
am 718fb9f1: Fix sample code issues
...
* commit '718fb9f12e31d92e8a81b08f0f2d818dd3654b9c':
Fix sample code issues
2012-11-30 13:16:57 -08:00
Daniel Sandler
076324ae19
Fix rounding error when drawing panel handles.
...
Bug: 7649037
Change-Id: If8d9fa5f3852729207c31c95cfd68ef54ff47d7d
2012-11-30 16:14:21 -05:00
Daniel Sandler
924fc3e6ce
Merge "Add constant for Daydream settings." into jb-mr1.1-dev
2012-11-30 13:03:08 -08:00
Elliott Hughes
9813e365e5
am 940ad4aa: Merge "Make AudioGroup.add locale safe"
...
* commit '940ad4aaef6ad27a2a214559100a18100b2b3b24':
Make AudioGroup.add locale safe
2012-11-30 12:45:30 -08:00
Roger Chen
0ce57a92d7
Change the text color of timer in MediaController
...
The color of timer and backgroud in MediaController
are too closer to distinguish.
Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Cherrypicked from external contribution.
b/7648349
2012-11-30 12:43:41 -08:00
Robert Ly
861c55ffcc
am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
...
* commit '2dd93e22b6504eda5fb35f8f9e58ddb3f4a22fea':
docs: add correct toc for google reference
2012-11-30 12:40:43 -08:00
Robert Ly
1c92ce10b5
am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
...
* commit '24963e1f7b7ba2712618b8c0ff1750c47ad1c789':
Revert "docs: gms javadocs"
2012-11-30 12:40:40 -08:00
Svetoslav Ganov
0e7adaff99
am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '438a3b35f7a6184a19919de90f733be82e21a84c':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 12:40:37 -08:00
Jason Sams
718fb9f12e
Fix sample code issues
...
Correct min SDK.
Correct file extension on mandelbrot
Change-Id: I508c22c382f1a930b27d8c5f4414cac3a990a332
2012-11-30 12:32:36 -08:00
Daniel Sandler
6f7654d665
Reduce false swipe-closed gestures in status bar panels.
...
VelocityTracker is a powerful tool---too powerful, in this
case, because many devices (I'm looking at you, Nexus 7)
have touchscreens that report total garbage on takeoff and
landing.
PanelView now uses its own incredibly crude velocity tracker
called FlingTracker, which implements a short sliding window
of the last 8 motion events (7 intervals) over which touch
velocity is averaged. There's also a little bias toward more
recent touch events so that the overall velocity of small
circular gestures will tend to favor the exit tangent.
The end result is a primitive low-pass filter on touch
velocity that should help us avoid situations where one (or
even two!) stray MotionEvents at the end of a gesture won't
invalidate the overall thrust.
Bug: 7422342
Change-Id: Idae38d1957727e400493324af4eee357ba5baa27
2012-11-30 15:28:38 -05:00
Robert Ly
2dd93e22b6
Merge "docs: add correct toc for google reference" into jb-mr1-dev
2012-11-30 12:13:07 -08:00
Robert Ly
01b88d3478
docs: add correct toc for google reference
...
Change-Id: I594794b8d7ed5c52acdc37d5a4eddd2fdd229bcd
2012-11-30 11:58:19 -08:00
Robert Ly
24963e1f7b
Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
2012-11-30 11:52:43 -08:00
Svetoslav Ganov
438a3b35f7
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
2012-11-30 11:43:54 -08:00
Elliott Hughes
940ad4aaef
Merge "Make AudioGroup.add locale safe"
2012-11-30 11:20:23 -08:00
Martijn Coenen
1b3a4362a0
am f77445cd: am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
...
* commit 'f77445cd48f9174647c4c7ff539036b5aa08ce6e':
Allow the NFC process to call Bluetooth APIs.
2012-11-30 11:11:44 -08:00
Martijn Coenen
f77445cd48
am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
...
* commit 'b1a01ab01c2aa5136f7781c3a6ec682590e38ac4':
Allow the NFC process to call Bluetooth APIs.
2012-11-30 11:09:43 -08:00
Martijn Coenen
b1a01ab01c
Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
2012-11-30 11:08:07 -08:00
Dianne Hackborn
7b1af76074
am 1bd7d5e4: am 675814d4: Merge "Maybe fix issue #7596986 : Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
...
* commit '1bd7d5e47ed7e73c244b79c5a92d6af1e3e89266':
Maybe fix issue #7596986 : Frequent runtime restarts; IAE at...
2012-11-30 10:47:01 -08:00
Dianne Hackborn
1bd7d5e47e
am 675814d4: Merge "Maybe fix issue #7596986 : Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
...
* commit '675814d488579582e0214cc720d9ccc310173f25':
Maybe fix issue #7596986 : Frequent runtime restarts; IAE at...
2012-11-30 10:45:02 -08:00
Dianne Hackborn
675814d488
Merge "Maybe fix issue #7596986 : Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
2012-11-30 10:42:15 -08:00
Nick Kralevich
4816f4b408
am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '0def7b94960ae551c498212d97c7919da7529429':
Secure a handful of framework broadcasts
2012-11-30 10:40:18 -08:00
Nick Kralevich
0def7b9496
am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '849f5188e34ea667b689e795d88411a2412db2e8':
Secure a handful of framework broadcasts
2012-11-30 10:38:21 -08:00
Nick Kralevich
849f5188e3
am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
Secure a handful of framework broadcasts
2012-11-30 10:35:44 -08:00
Nick Kralevich
6643ea823b
resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
2012-11-30 10:23:56 -08:00
Daniel Sandler
590e0e5b8d
am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
...
* commit '5dde83c4d1e9b3c39f0dbba07421a7dcf678a4cf':
Suppress quick settings if setup has not been completed.
2012-11-30 10:09:16 -08:00
Daniel Sandler
5dde83c4d1
am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
...
* commit '0a6620e8615ade341336730a5aa9f0e62a295c9f':
Suppress quick settings if setup has not been completed.
2012-11-30 10:07:01 -08:00
Robert Greenwalt
011132a7d3
am b8da0376: Secure a handful of framework broadcasts
...
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
Secure a handful of framework broadcasts
2012-11-30 10:05:33 -08:00
Daniel Sandler
0a6620e861
Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
2012-11-30 10:05:01 -08:00
Scott Main
63c84b75e4
am 0988f445: am 73117424: am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
...
* commit '0988f445a1b802f56ff7576d34e06cce7538701a':
docs: gms and gcm javadocs
2012-11-30 10:03:29 -08:00