Michael Jurka
f080a24e09
am 04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev
...
* commit '04cead14b627947df7f1b713c35a3e03bef94286':
Fix calculation of default wallpaper size
2013-11-06 11:12:33 -08:00
Michael Jurka
04cead14b6
Merge "Fix calculation of default wallpaper size" into klp-dev
2013-11-06 19:06:50 +00:00
Ruben Brunk
21a99ddd9c
Disable face unlock when returning from camera.
...
Bug: 11063890
- Workaround for bug 11063890. Avoids the acquire/release
race when resuming face unlock while pausing the camera
widget.
Change-Id: I0a58f3a07f346da72ea55772242b4f9c54537235
2013-11-06 10:21:43 -08:00
Patrick Tjin
5eecb9e8d4
am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev
...
* commit 'bd9513f3b27a9a15a12474ff5b270abd69a013a1':
Add HSPA+ to BatteryStats
2013-11-06 10:16:56 -08:00
Patrick Tjin
bd9513f3b2
Merge "Add HSPA+ to BatteryStats" into klp-dev
2013-11-06 18:12:47 +00:00
Ruben Brunk
6327136cdb
am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
...
* commit '6fe15c3d5f1b2759b06f3ce489071bb7708d7f6b':
gcam: Avoid leaking repeating CaptureRequests.
2013-11-06 10:09:57 -08:00
Ruben Brunk
6fe15c3d5f
Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
2013-11-06 18:07:28 +00:00
Adam Lesinski
35040fdc42
am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
...
* commit '1aac29c3dd6feece257882469d9825255c69c736':
Fix off-by-one issue when removing from Iterator
2013-11-06 09:51:14 -08:00
Adam Lesinski
1aac29c3dd
Merge "Fix off-by-one issue when removing from Iterator" into klp-dev
2013-11-06 17:49:21 +00:00
Patrick Tjin
b71703cfdf
Add HSPA+ to BatteryStats
...
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.
Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
2013-11-06 17:29:33 +00:00
Eric Laurent
e661b541a5
am 7791b84c: Merge "AudioService: fix notifications with A2DP abs volume" into klp-dev
...
* commit '7791b84c153463431635d2a8aa0fda7f1d8763a7':
AudioService: fix notifications with A2DP abs volume
2013-11-06 08:40:55 -08:00
Eric Laurent
7791b84c15
Merge "AudioService: fix notifications with A2DP abs volume" into klp-dev
2013-11-06 16:39:12 +00:00
Michael Jurka
8ef6da5c9e
am b922178d: Merge "More background protection in Recents for status bar" into klp-dev
...
* commit 'b922178dce8464aa46203812d8bd4424c47ba486':
More background protection in Recents for status bar
2013-11-06 04:58:34 -08:00
Michael Jurka
b922178dce
Merge "More background protection in Recents for status bar" into klp-dev
2013-11-06 12:38:23 +00:00
Michael Jurka
eed96a0b90
Fix calculation of default wallpaper size
...
Bug: 11324470
2013-11-06 13:22:51 +01:00
Jim Miller
81190befe6
Fix issue where transport control shows up off-screen on tablets
...
This fix selects the current page ealier in the reconstruction
of Keyguard to ensure the layout bounds of KeyguardWidgetPager are
correct by the time it does the initial layout.
In addition this change postpones selecting the transport page if
the transport was just added.
Fixes bug 11287144
Change-Id: I92ba8bb5e13c166d13fbaa26881f5034d5ab2104
2013-11-05 21:14:18 -08:00
John Spurlock
b2b56eaeb1
am 499c7eeb: Merge "Update remaining settings icon with old style." into klp-dev
...
* commit '499c7eeb9ad59e5449481eb871db24a176f2ccdb':
Update remaining settings icon with old style.
2013-11-05 18:50:36 -08:00
John Spurlock
499c7eeb9a
Merge "Update remaining settings icon with old style." into klp-dev
2013-11-06 02:48:07 +00:00
John Spurlock
88f3d6bde0
Update remaining settings icon with old style.
...
Bug:11412369
Change-Id: I7827e3060d9dbf320c23ac7c43e4ef4a5fae3773
2013-11-05 21:41:23 -05:00
John Spurlock
e88d14a8b8
am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev
...
* commit '9d383ece52620b0358bcfae7f2102b64acd1d5cb':
Fix recent regression in DrawableContainer.
2013-11-05 18:35:00 -08:00
John Spurlock
9d383ece52
Merge "Fix recent regression in DrawableContainer." into klp-dev
2013-11-06 02:29:20 +00:00
Chris Craik
f918444fdd
am 6fbd4829: Merge "Work around nested SaveLayerAlpha bug" into klp-dev
...
* commit '6fbd4829a9614f0d6c668cd5ccba6cabdaeb81a0':
Work around nested SaveLayerAlpha bug
2013-11-05 18:23:00 -08:00
Chris Craik
6fbd4829a9
Merge "Work around nested SaveLayerAlpha bug" into klp-dev
2013-11-06 02:20:20 +00:00
Chris Craik
362adb84d9
Work around nested SaveLayerAlpha bug
...
bug:11481077
Because TextView marquee and KeyguardSecurityViewFlipper use SaveLayer
(for the marquee fading effect and view alpha, respectively), both can
be nested, which hits a bug in the renderer resulting in artifacts.
Workaround this by setting a hardware layer on the marquee, so that
those marquee effects are drawn outside of the ViewFlipper.
Change-Id: If8b7ebb20d3959cb930a8bea2146ba3f8e659612
2013-11-05 17:41:21 -08:00
Adam Koch
57c9886d4b
Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.
...
Bug: 6064760
Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e
(cherry picked from commit e1693df494dbdedfb5eac56bf59f86afc893b778)
2013-11-06 01:18:05 +00:00
Adam Koch
0c5268c359
am be0b05a0: Merge "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760" into klp-dev
...
* commit 'be0b05a028ebc1b49ed32b79d53af384106c31a3':
Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760
2013-11-05 17:15:23 -08:00
Adam Koch
be0b05a028
Merge "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760" into klp-dev
2013-11-06 01:13:44 +00:00
Christopher Tate
3aeea1f25a
System package permission decls take precedence over 3rd party apps'
...
In particular, if a 3rd party app tries to define a permission that
turns out to be defined by system packages following an upgrade,
the system package gets ownership and grants are re-evaluated
on that basis.
Bug 11242510
Change-Id: Id3a2b53d52750c629414cd8226e33e5e03dd0c54
2013-11-05 16:27:07 -08:00
Dirk Dougherty
4ef4d898f6
resolved conflicts for merge of 790f9183 to klp-ub-dev
...
Change-Id: I11c97db0ef83f59d629fb9406bb0e240714e5f89
2013-11-05 16:17:27 -08:00
John Spurlock
f68bb66c6e
Fix recent regression in DrawableContainer.
...
Ensure optical insets are never null.
Bug:11537082
Change-Id: Ib75be83909fac612ae947f501835285cd8a79862
2013-11-05 19:15:41 -05:00
Robert Greenwalt
5ce5c9bcc5
am 4653837b: Merge "Add config var for single-pdn devices/networks." into klp-dev
...
* commit '4653837b78b7da950e7827598baabc79be1aa4ca':
Add config var for single-pdn devices/networks.
2013-11-05 16:00:15 -08:00
Robert Greenwalt
4653837b78
Merge "Add config var for single-pdn devices/networks." into klp-dev
2013-11-05 23:58:07 +00:00
Michael Wright
65031a2913
Continue synthesizing data even after brightness adjustment
...
Bug: 11337887
Change-Id: I80adb330c4e9250965030626634002a1b9c999cf
2013-11-05 15:49:52 -08:00
Joe Fernandez
1bf478743e
resolved conflicts for merge of 559a00ad to klp-ub-dev
...
Change-Id: I938f7fe6bcf927ceaeac9b270b8f6b023b21ac91
2013-11-05 15:31:22 -08:00
Joe Fernandez
81dec975e4
resolved conflicts for merge of 43730d47 to klp-ub-dev
...
Change-Id: Iddf9c792ff86a1db2c882f3d53d7d05e00261fe9
2013-11-05 15:21:32 -08:00
Joe Fernandez
425c9e0e65
am 61a7ee53: docs: SDK-ADT 22.3 RC5 - updated signatures
...
* commit '61a7ee53eb33b299565c426304dd2bc8b8d7254c':
docs: SDK-ADT 22.3 RC5 - updated signatures
2013-11-05 21:30:11 +00:00
Joe Fernandez
03b459c4fe
am b501da92: docs: NDK r9b Release Notes
...
* commit 'b501da92779efe8b5fe0d5aa63f1e7f6c92f1b78':
docs: NDK r9b Release Notes
2013-11-05 21:30:11 +00:00
Joe Fernandez
edb154b539
am fbdd0280: docs: Add screenrecord command to adb docs
...
* commit 'fbdd028055ad0f6ef613466f44bc99e1d7c14e76':
docs: Add screenrecord command to adb docs
2013-11-05 21:30:10 +00:00
Scott Main
4cceab2daf
am ef765bda: add filler version of sidenav that will be removed by javascript. This is simply to reduce the perceived load time, which was previously high because the sidenav was mostly empty.
...
* commit 'ef765bdaf42dfd9d30303b44dd7b614e6d631701':
add filler version of sidenav that will be removed by javascript. This is simply to reduce the perceived load time, which was previously high because the sidenav was mostly empty.
2013-11-05 21:30:09 +00:00
Adam Koch
e1693df494
Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.
...
Bug: 6064760
Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e
2013-11-05 16:00:09 -05:00
Vineeta Srivastava
aee87dd202
am 65d4a84b: Merge "Setting Tethering profile for specific network" into klp-dev
...
* commit '65d4a84b980583e068dd21bf11e5fe034df8d7ef':
Setting Tethering profile for specific network
2013-11-05 12:53:22 -08:00
John Spurlock
6e0b89a5a0
am 47c46dd5: Merge "Battery icon tweaks." into klp-dev
...
* commit '47c46dd56dc0414ebf6220481f04cc8767268b5c':
Battery icon tweaks.
2013-11-05 12:53:19 -08:00
Vineeta Srivastava
65d4a84b98
Merge "Setting Tethering profile for specific network" into klp-dev
2013-11-05 20:50:09 +00:00
Jeff Sharkey
f5073e71c2
am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev
...
* commit '5f4affdab8ff25d3657075a0b3ae10697aae77da':
Clarify DocumentsProvider recents behavior.
2013-11-05 12:49:49 -08:00
John Spurlock
47c46dd56d
Merge "Battery icon tweaks." into klp-dev
2013-11-05 20:48:42 +00:00
John Spurlock
eaf393bc94
am a90f8160: Merge "Enable translucent system bars on the lockscreen by default." into klp-dev
...
* commit 'a90f816048604538cc25d3b8848ac263761175b4':
Enable translucent system bars on the lockscreen by default.
2013-11-05 12:46:15 -08:00
Jeff Sharkey
5f4affdab8
Merge "Clarify DocumentsProvider recents behavior." into klp-dev
2013-11-05 20:46:11 +00:00
Jeff Sharkey
4967a11f8c
am 74b0f5ac: Merge "Let Shell modify secondary external storage." into klp-dev
...
* commit '74b0f5acdfaa64afc27ba440883a8d1ead07f999':
Let Shell modify secondary external storage.
2013-11-05 12:46:11 -08:00
John Spurlock
a90f816048
Merge "Enable translucent system bars on the lockscreen by default." into klp-dev
2013-11-05 20:45:15 +00:00
Jeff Sharkey
74b0f5acdf
Merge "Let Shell modify secondary external storage." into klp-dev
2013-11-05 20:44:09 +00:00