OSDN Git Service
Craig Mautner [Thu, 7 Nov 2013 20:54:50 +0000 (12:54 -0800)]
am
c9ffd746: Merge "Don\'t call setTask twice." into klp-dev
* commit '
c9ffd74659fac6f30f3f4653586af2069b903899':
Don't call setTask twice.
Craig Mautner [Thu, 7 Nov 2013 20:51:29 +0000 (20:51 +0000)]
Merge "Don't call setTask twice." into klp-dev
Craig Mautner [Thu, 7 Nov 2013 20:51:21 +0000 (12:51 -0800)]
am
20409674: Merge "If home activity is not fullscreen keep drilling." into klp-dev
* commit '
2040967478790f67e286b203d5397159ac34006e':
If home activity is not fullscreen keep drilling.
Craig Mautner [Thu, 7 Nov 2013 20:49:01 +0000 (20:49 +0000)]
Merge "If home activity is not fullscreen keep drilling." into klp-dev
Craig Mautner [Thu, 7 Nov 2013 19:51:29 +0000 (11:51 -0800)]
If home activity is not fullscreen keep drilling.
When the home activity launches a non-fullscreen activity as part of
its own task then ensureActivitiesVisibleLocked() must continue past
the launched activity when determining activities to show and hide.
Stopping at the non-fullscreen activity leaves the fullscreen home
activity hidden.
Fixes bug
11555762.
Change-Id: I9058d8cde3a41cb7f9b1f97e5c0cb32e9b0f5af7
Fabrice Di Meglio [Thu, 7 Nov 2013 19:21:06 +0000 (11:21 -0800)]
am
ff49e2d9: Merge "Improve RTL support for Immersive mode" into klp-dev
* commit '
ff49e2d9d811db916190f61cc3cc03d4359d4952':
Improve RTL support for Immersive mode
Fabrice Di Meglio [Thu, 7 Nov 2013 19:21:03 +0000 (11:21 -0800)]
am
435c0ee1: Merge "Fix bug #
11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
* commit '
435c0ee10af132937dc0a22c39380624e6efd5ab':
Fix bug #
11537133 Hideycling looks broken (KOT36), missing left padding
Fabrice Di Meglio [Thu, 7 Nov 2013 19:18:14 +0000 (19:18 +0000)]
Merge "Improve RTL support for Immersive mode" into klp-dev
Fabrice Di Meglio [Thu, 7 Nov 2013 19:17:59 +0000 (19:17 +0000)]
Merge "Fix bug #
11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
Robert Greenwalt [Thu, 7 Nov 2013 18:32:53 +0000 (10:32 -0800)]
am
e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
* commit '
e8c51298a43f607fea7418ced7cc783e6065fe87':
Add BatteryStats for Wifi Batched Scanning.
Robert Greenwalt [Thu, 7 Nov 2013 18:30:49 +0000 (18:30 +0000)]
Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
Dianne Hackborn [Thu, 7 Nov 2013 18:18:53 +0000 (10:18 -0800)]
am
9882d388: Merge "Fix issue #
11223338: Not retaining service started state while restarting" into klp-dev
* commit '
9882d3889957200c3db62f47142988dea99a7291':
Fix issue #
11223338: Not retaining service started state while restarting
Dianne Hackborn [Thu, 7 Nov 2013 18:16:10 +0000 (18:16 +0000)]
Merge "Fix issue #
11223338: Not retaining service started state while restarting" into klp-dev
Dirk Dougherty [Thu, 7 Nov 2013 17:28:16 +0000 (17:28 +0000)]
am
347b6fc9: Doc change: remove a reference to RTL pseudolocale.
* commit '
347b6fc9e3bbd15364a0d1be74bd6ed98a3a1bfe':
Doc change: remove a reference to RTL pseudolocale.
Dirk Dougherty [Thu, 7 Nov 2013 17:22:52 +0000 (09:22 -0800)]
Doc change: remove a reference to RTL pseudolocale.
Change-Id: If6174954008b6875a7cb0ffcc89d1e04dd702b02
Craig Mautner [Thu, 7 Nov 2013 17:10:42 +0000 (09:10 -0800)]
Don't call setTask twice.
The method ActivityRecord.setTask() removes the ActivityRecord from
its old task's mActivities ArrayList. In jb-mr2 it did not have this
side effect (there was no mActivities) so calling it twice was not a
problem. This fix causes setTask to only be called once for the target
activity.
Fixes bug
11557835.
Change-Id: If2b6d4b297e86130009713efe6891a24fad3dd15
Scott Main [Thu, 7 Nov 2013 05:19:50 +0000 (05:19 +0000)]
am
b680f3c3: Merge "udpate gcore setup doc with info for android studio" into klp-docs
* commit '
b680f3c347e6c3d8d6eab64501dd647d61517567':
udpate gcore setup doc with info for android studio
Scott Main [Thu, 7 Nov 2013 05:19:47 +0000 (05:19 +0000)]
am
334cc487: add maxSdkVersion attribute to uses-permission doc
* commit '
334cc4874f8cd89b5c7a2fc1a792a35beaf16c57':
add maxSdkVersion attribute to uses-permission doc
Adam Koch [Thu, 7 Nov 2013 05:19:45 +0000 (05:19 +0000)]
am
57c9886d: Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug:
6064760
* commit '
57c9886d4bbe8af0391b397e74a54d7ac7f1ebb6':
Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug:
6064760
Dirk Dougherty [Thu, 7 Nov 2013 05:19:42 +0000 (05:19 +0000)]
am
a5f542a3: Doc change: adjust wording for Force RTL layout developer option.
* commit '
a5f542a30363825a70ff737e232699726b2261f7':
Doc change: adjust wording for Force RTL layout developer option.
Scott Main [Thu, 7 Nov 2013 05:19:39 +0000 (05:19 +0000)]
am
d7abd97f: fix broken links
* commit '
d7abd97f64fd35d333655b5b71c0844a1e7a4d97':
fix broken links
Dirk Dougherty [Thu, 7 Nov 2013 05:19:37 +0000 (05:19 +0000)]
am
9399d919: Doc change: Edits to graphics highlights.
* commit '
9399d91944e38bc33f5bed8fb141fd400d436709':
Doc change: Edits to graphics highlights.
John Spurlock [Thu, 7 Nov 2013 05:19:33 +0000 (05:19 +0000)]
am
317c79f8: Merge "Docfixes for DownloadManager." into klp-docs
* commit '
317c79f80b878a4cbc99979a13a1b3c6cf948767':
Docfixes for DownloadManager.
Dirk Dougherty [Thu, 7 Nov 2013 05:19:31 +0000 (05:19 +0000)]
am
9a52d659: Doc change: minor fixes to highlights and images.
* commit '
9a52d659872c55a9343068ce297fe396e5394dd6':
Doc change: minor fixes to highlights and images.
Scott Main [Thu, 7 Nov 2013 05:19:28 +0000 (05:19 +0000)]
am
5ff96b94: Merge "Doc update: restore missing GCM updates" into klp-docs
* commit '
5ff96b946b10825c504c3ee3f00be04f81d3a44f':
Doc update: restore missing GCM updates
Scott Main [Thu, 7 Nov 2013 05:19:25 +0000 (05:19 +0000)]
Scott Main [Thu, 7 Nov 2013 05:19:23 +0000 (05:19 +0000)]
am
4cf4f521: add storage provider sample to build
* commit '
4cf4f5213e496b8862aa2d88d00eb0c734598072':
add storage provider sample to build
Scott Main [Thu, 7 Nov 2013 05:19:20 +0000 (05:19 +0000)]
am
19f05adb: change sensor FIFO method to getFifoMaxEventCount
* commit '
19f05adbee3c755daf8417d6de4fae831e7cc446':
change sensor FIFO method to getFifoMaxEventCount
Scott Main [Thu, 7 Nov 2013 05:19:17 +0000 (05:19 +0000)]
am
2aa2b1c3: some people use macintosh computers bug:
11479988
* commit '
2aa2b1c360749c0cf21ac97bfd01d280b80659a5':
some people use macintosh computers bug:
11479988
Scott Main [Thu, 7 Nov 2013 05:19:14 +0000 (05:19 +0000)]
am
b00f26a1: Merge "update web app docs to remove target-densitydpi, remove the overview page, remove a bunch of stuff from the doc about screens and refer to external docs instead, and add tips about debugging on 4.4 w/ dev tools." into klp-docs
* commit '
b00f26a1722e3a31dca48bf47568ee54686dba30':
update web app docs to remove target-densitydpi, remove the overview page, remove a bunch of stuff from the doc about screens and refer to external docs instead, and add tips about debugging on 4.4 w/ dev tools.
Scott Main [Thu, 7 Nov 2013 05:19:14 +0000 (05:19 +0000)]
am
b4e2cea5: simplify gl table
* commit '
b4e2cea57dd7ca74baede6f4fed48ce67a661abe':
simplify gl table
Scott Main [Thu, 7 Nov 2013 05:19:13 +0000 (05:19 +0000)]
am
7ae98ba9: fix dashboard to add opengl 3.0
* commit '
7ae98ba9f2570ad819e995cde8db2b9b837a401a':
fix dashboard to add opengl 3.0
Scott Main [Thu, 7 Nov 2013 05:19:13 +0000 (05:19 +0000)]
am
3e0cb9ba: dashboard update for 11/1/13
* commit '
3e0cb9ba1876d23ed4c1e051b358a388c2fcaeaa':
dashboard update for 11/1/13
Dirk Dougherty [Thu, 7 Nov 2013 05:19:12 +0000 (05:19 +0000)]
am
bb0ab667: Doc change: Extend link to image.
* commit '
bb0ab6675657bde30df4c2bcce93b8cd56672300':
Doc change: Extend link to image.
Newton Allen [Thu, 7 Nov 2013 05:19:12 +0000 (05:19 +0000)]
am
47feee53: Merge "Fix some documentation typos." into klp-docs
* commit '
47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
Fix some documentation typos.
Dirk Dougherty [Thu, 7 Nov 2013 05:19:11 +0000 (05:19 +0000)]
am
f385d2fd: Doc change: remove staging urls for chrome and wallet sites.
* commit '
f385d2fdb175b027d682876b9c784881f679d3f7':
Doc change: remove staging urls for chrome and wallet sites.
Scott Main [Thu, 7 Nov 2013 05:19:11 +0000 (05:19 +0000)]
am
f3db5a80: remove misinformation about sensor alarms
* commit '
f3db5a80ccdfe7478812ba791c931a7202c12b0b':
remove misinformation about sensor alarms
Scott Main [Thu, 7 Nov 2013 05:19:10 +0000 (05:19 +0000)]
am
6934add2: fix version typo
* commit '
6934add2692ffbad8f299aaef80ee8d3f1f991d6':
fix version typo
Scott Main [Thu, 7 Nov 2013 05:19:10 +0000 (05:19 +0000)]
am
57ecb14b: link fix to kick the build server
* commit '
57ecb14bafa0ff227fe19bf00f081c223f4a58df':
link fix to kick the build server
Scott Main [Thu, 7 Nov 2013 05:19:09 +0000 (05:19 +0000)]
Svetoslav Ganov [Thu, 7 Nov 2013 05:19:09 +0000 (05:19 +0000)]
am
78da147d: Update the PdfDocument docs with unsupported operations.
* commit '
78da147d426c80baac63aeaf521f112d8c4c1d2d':
Update the PdfDocument docs with unsupported operations.
Scott Main [Thu, 7 Nov 2013 05:19:08 +0000 (05:19 +0000)]
am
73b5572f: update HCE doc images to dac stencils
* commit '
73b5572f374d6c0e8e69f7387da9d1ff6ce144b8':
update HCE doc images to dac stencils
Scott Main [Thu, 7 Nov 2013 05:19:08 +0000 (05:19 +0000)]
am
7d1d7fa3: Merge "Doc update: Managing System UI class" into klp-docs
* commit '
7d1d7fa33e593599b5a1bb9abb71914a962f2820':
Doc update: Managing System UI class
Katie McCormick [Thu, 7 Nov 2013 05:19:07 +0000 (05:19 +0000)]
am
f0c2bfd1: Doc change: new Storage Access Framework doc
* commit '
f0c2bfd1c7dd7fe0b9dea41cf2859176af525ad6':
Doc change: new Storage Access Framework doc
Joe Fernandez [Thu, 7 Nov 2013 05:19:07 +0000 (05:19 +0000)]
am
b9602bcb: Merge "docs: Screenrecord - add Android 4.4 availability" into klp-docs
* commit '
b9602bcb5e7fe4a9097d32d235047580e4ee9aa0':
docs: Screenrecord - add Android 4.4 availability
Dirk Dougherty [Thu, 7 Nov 2013 05:19:06 +0000 (05:19 +0000)]
am
809b0840: Doc change: fix url.
* commit '
809b08409697f3d0574945efe728f04920cc6036':
Doc change: fix url.
Scott Main [Thu, 7 Nov 2013 05:19:06 +0000 (05:19 +0000)]
am
66bae5ad: update sample nav dummy links to remove topic.html
* commit '
66bae5ad9311c9474c27156de96814b27b4206c3':
update sample nav dummy links to remove topic.html
Roman Nurik [Thu, 7 Nov 2013 05:19:05 +0000 (05:19 +0000)]
am
e0510aee: Add ZIP download for DevBytes: Immersive Mode.
* commit '
e0510aee093aa7f25adac28aa241aff4e4392aa9':
Add ZIP download for DevBytes: Immersive Mode.
Dirk Dougherty [Thu, 7 Nov 2013 05:19:05 +0000 (05:19 +0000)]
am
79fbed08: Doc change: adjust element spacing.
* commit '
79fbed08bd8bcf8c44adfc0a8306b77af2213585':
Doc change: adjust element spacing.
Dirk Dougherty [Thu, 7 Nov 2013 04:53:44 +0000 (20:53 -0800)]
resolved conflicts for merge of
ad209a93 to klp-ub-dev
Change-Id: Ib474819c1100b75de65915986213c4c14d017100
Baligh Uddin [Thu, 7 Nov 2013 04:00:17 +0000 (20:00 -0800)]
am
41c2f04e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
41c2f04e2a7f48c88f59e91d4b2b130dbfb2fce5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:00:13 +0000 (20:00 -0800)]
am
5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5be3186bac66fa08ad3ee86537492ada9e822879':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 03:55:33 +0000 (03:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 7 Nov 2013 03:55:19 +0000 (03:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Scott Main [Thu, 7 Nov 2013 03:29:01 +0000 (03:29 +0000)]
Merge "udpate gcore setup doc with info for android studio" into klp-docs
Jim Miller [Thu, 7 Nov 2013 03:16:59 +0000 (19:16 -0800)]
am
b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev
* commit '
b892ac680b045daca2926037955857889d32e1c0':
Fix glitch with switching users from QuickSettings
Jim Miller [Thu, 7 Nov 2013 03:14:37 +0000 (03:14 +0000)]
Merge "Fix glitch with switching users from QuickSettings" into klp-dev
Scott Main [Thu, 7 Nov 2013 00:58:36 +0000 (16:58 -0800)]
add maxSdkVersion attribute to uses-permission doc
Change-Id: I612aeb9444a360ca3ebf4675dca05145beae5b04
Scott Main [Thu, 7 Nov 2013 00:33:22 +0000 (16:33 -0800)]
udpate gcore setup doc with info for android studio
Change-Id: I3125d3b4d2c68fcb3ba281d0051e2acb5033a6f9
Robert Greenwalt [Wed, 25 Sep 2013 23:38:12 +0000 (16:38 -0700)]
Add BatteryStats for Wifi Batched Scanning.
bug:
10690989
Change-Id: Ia39b715ee6d5733970095bc76de0ed40ff8208c0
Christopher Tate [Thu, 7 Nov 2013 00:57:01 +0000 (16:57 -0800)]
am
c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev
* commit '
c157cac9b2827a4eeb0ea29209fbb879a6076de4':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Thu, 7 Nov 2013 00:54:54 +0000 (00:54 +0000)]
Merge "System package permission decls take precedence over 3rd party apps'" into klp-dev
Dianne Hackborn [Thu, 7 Nov 2013 00:30:29 +0000 (16:30 -0800)]
Fix issue #
11223338: Not retaining service started state while restarting
When I cleaned up how we maintained the lifecycle of the tracker with a
service, I broke most tracking of the service restart state. (Since at
that point the service is no longer associated with a process, so I
must clean up the tracker state). This change introduces a new special
case for interacting with a service tracker to explicitly tell it when
a service is being restarted. It also fixes how we update the process
state when services are attached to it, so it goes in and out of the
restarting state correctly.
In addition:
- Maybe fix issue #
11224000 (APR: Dependent processes not getting added
to LRU list). We were not clearing ServiceRecord.app when bringing
down a service, so if for some reason there were still connections to
it at that point (which could happen for example for non-create bindings),
then we would so it when updating the LRU state of that client process.
- dumpsys procstats's package argument can now be a package or process
name, and we will dump all relevent information we can find about that
name.
- Generally improved the quality of the dumpsys procstats output with its
various options.
- Fixed a bug in ActivityManager.dumpPackageState() where it would hang if
the service was dumping too much, added meminfo to the set of things
dumped, and tweaked command line options to include more data.
- Added some more cleaning code to ActiveServices.killServices() to make
sure we clean out any restarting ServiceRecord entries when a process is
being force stopped.
- Re-arranged ActiveServices.killServices() to do the main killing of the
service first, to avoid some wtf() calls that could happen when removing
connections.
Bug:
11223338
Bug:
11224000
Change-Id: I5db28561c2c78aa43561e52256ff92c02311c56f
Adam Powell [Thu, 7 Nov 2013 00:05:23 +0000 (16:05 -0800)]
am
2942053c: Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev
* commit '
2942053c25b577f4ecdd431072cc438b16d2778b':
Merge toast frame assets, update themes, etc. accordingly
Adam Powell [Thu, 7 Nov 2013 00:01:09 +0000 (00:01 +0000)]
Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev
Fabrice Di Meglio [Wed, 6 Nov 2013 23:44:52 +0000 (15:44 -0800)]
Improve RTL support for Immersive mode
- use start/end instead of left/ritgh padding
- related to bug #
11537133 Hideycling looks broken (KOT36), missing left padding
Change-Id: I0d8e1de560dbf142a3c016ab6d6784361d88d32a
Dirk Dougherty [Wed, 6 Nov 2013 23:42:01 +0000 (15:42 -0800)]
resolved conflicts for merge of
b08447ba to klp-ub-dev
Change-Id: I77406f89d3b499f831ba4a66b7bf79039838c5b2
Fabrice Di Meglio [Wed, 6 Nov 2013 23:32:01 +0000 (15:32 -0800)]
Fix bug #
11537133 Hideycling looks broken (KOT36), missing left padding
- enforce the Drawable boolean getPadding(Rect) contract for NinePatchDrawable
and DrawableContainer.
- as NinePatchDrawable was not enforcing it, the consequence was that the
mUserPaddingLeftInitial / mUserPaddingRitghInitial were reset to "0" (even
if they got the correct value before the reset).
Change-Id: I1efe7fad5f89c0ca47f90189f6d89940e0e9c6ae
Chris Craik [Wed, 6 Nov 2013 23:26:51 +0000 (15:26 -0800)]
am
47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
* commit '
47742d4bb004a51c045d443024a36d784cd38d9b':
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
Ruben Brunk [Wed, 6 Nov 2013 23:26:48 +0000 (15:26 -0800)]
am
e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit '
e77d2a9c62e747902bc53d40e303214705702b00':
Disable face unlock when returning from camera.
Craig Mautner [Wed, 6 Nov 2013 23:26:45 +0000 (15:26 -0800)]
am
c9d0ee5e: Merge "Tweak test for layout." into klp-dev
* commit '
c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952':
Tweak test for layout.
Chris Craik [Wed, 6 Nov 2013 23:23:56 +0000 (23:23 +0000)]
Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev
Craig Mautner [Wed, 6 Nov 2013 23:23:15 +0000 (15:23 -0800)]
am
def34eb7: Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev
* commit '
def34eb775caf8eb56248d536ec56b39c47e4431':
Ensure bar window state is SHOWING after rotate if visible.
Ruben Brunk [Wed, 6 Nov 2013 23:22:54 +0000 (23:22 +0000)]
Merge "Disable face unlock when returning from camera." into klp-dev
Craig Mautner [Wed, 6 Nov 2013 23:22:12 +0000 (23:22 +0000)]
Merge "Tweak test for layout." into klp-dev
Craig Mautner [Wed, 6 Nov 2013 23:19:58 +0000 (23:19 +0000)]
Merge "Ensure bar window state is SHOWING after rotate if visible." into klp-dev
Craig Mautner [Wed, 6 Nov 2013 22:52:36 +0000 (14:52 -0800)]
Tweak test for layout.
Return to old way of only laying out Keyguard on configuration change
and add a new qualifier that does a layout if a window is part of an
opening app. This qualifier allows apps that handle their own
configuration changes to be notified of screen changes after the
configuration has changed. Apps that do not handle their own
configuration changes find their way into this code because their
surfaces are recreated by default and mHaveFrame is false.
This fixes bug
11544694 and passes the test of all bugs listed in CL
ag/383579.
Change-Id: I3a679b27eb4a2c5210957bcd4ae2f10b46f6e076
Adam Powell [Wed, 6 Nov 2013 22:28:17 +0000 (14:28 -0800)]
Merge toast frame assets, update themes, etc. accordingly
Bug
11355837
Change-Id: Ie221b7a8490a65c744e06474fb68f2f123762d5d
Craig Mautner [Wed, 6 Nov 2013 22:22:26 +0000 (14:22 -0800)]
am
a724d865: Merge "Fix incorrect looping limits." into klp-dev
* commit '
a724d865372530e01e4bb14751e0305da9bc377b':
Fix incorrect looping limits.
Craig Mautner [Wed, 6 Nov 2013 22:20:24 +0000 (22:20 +0000)]
Merge "Fix incorrect looping limits." into klp-dev
John Spurlock [Wed, 6 Nov 2013 17:20:38 +0000 (12:20 -0500)]
Ensure bar window state is SHOWING after rotate if visible.
Bug:
11544694
Change-Id: Ied56f01a931f33437bdc05d026006cabcdef0149
Chris Craik [Wed, 6 Nov 2013 22:01:28 +0000 (14:01 -0800)]
Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
bug:
11556330
Change-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe
Craig Mautner [Wed, 6 Nov 2013 21:55:08 +0000 (13:55 -0800)]
Fix incorrect looping limits.
One cannot iterate across an entire list if one both removes an entry
and increments the index into the list. Do one or the other or you
will end up with bugs like
11556768 which is now fixed.
Change-Id: I57f1ad13075a005cae3c1cbfae10e230d9af143a
John Spurlock [Wed, 6 Nov 2013 21:52:15 +0000 (13:52 -0800)]
am
10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev
* commit '
10b9ac807f7cc0817e8dd4b96d587ccd41f8f177':
Fix lockscreen camera preview position in RTL.
John Spurlock [Wed, 6 Nov 2013 21:48:41 +0000 (21:48 +0000)]
Merge "Fix lockscreen camera preview position in RTL." into klp-dev
Jim Miller [Wed, 6 Nov 2013 21:19:27 +0000 (13:19 -0800)]
am
32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
* commit '
322934699433d703fa35505d72028abbcf8ce45f':
Fix issue where transport control shows up off-screen on tablets
Jim Miller [Wed, 6 Nov 2013 21:15:16 +0000 (21:15 +0000)]
Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
Michael Wright [Wed, 6 Nov 2013 20:35:03 +0000 (12:35 -0800)]
am
6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev
* commit '
6a29778eeb836fe01993b6dbd3734d8085f48015':
Continue synthesizing data even after brightness adjustment
Michael Wright [Wed, 6 Nov 2013 20:33:08 +0000 (20:33 +0000)]
Merge "Continue synthesizing data even after brightness adjustment" into klp-dev
Baligh Uddin [Wed, 6 Nov 2013 20:05:23 +0000 (12:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I74c56a144553ebe2d3d8587537f0d160fe3c6840
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 19:53:23 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I13dd4dfd6492c31975cd61e28caeea940a5f66cb
Auto-generated-cl: translation import
John Spurlock [Wed, 6 Nov 2013 14:35:07 +0000 (09:35 -0500)]
Fix lockscreen camera preview position in RTL.
Bug:
11263914
Change-Id: Ic3e5157ceb82495d10afd74b3af2655434a9467c
Victoria Lease [Wed, 6 Nov 2013 19:33:35 +0000 (11:33 -0800)]
am
c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev
* commit '
c89eaf916ad7e88565d2a15991432b22cd9099ff':
Fix for Typeface.create(Typeface, style) semantics changed in KK
Victoria Lease [Wed, 6 Nov 2013 19:30:22 +0000 (19:30 +0000)]
Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev
Raph Levien [Wed, 6 Nov 2013 19:12:11 +0000 (11:12 -0800)]
Fix for Typeface.create(Typeface, style) semantics changed in KK
This is a fix for bug
11553661. The "closest match" heuristic for
resolving a typeface when an exact match was not found changed between
JB MR2 and KK, resulting in loss of custom typeface when StyleSpan was
applied. This patch reinstates the logic that had been present. Also
reported externally as:
https://code.google.com/p/android/issues/detail?id=61771
Change-Id: Ia432fca07c4bf3b830ee2487cd8f5267a9cfb7ff
Michael Jurka [Wed, 6 Nov 2013 19:12:33 +0000 (11:12 -0800)]
am
04cead14: Merge "Fix calculation of default wallpaper size" into klp-dev
* commit '
04cead14b627947df7f1b713c35a3e03bef94286':
Fix calculation of default wallpaper size
Michael Jurka [Wed, 6 Nov 2013 19:06:49 +0000 (19:06 +0000)]
Merge "Fix calculation of default wallpaper size" into klp-dev
Ruben Brunk [Wed, 6 Nov 2013 02:29:06 +0000 (18:29 -0800)]
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
Patrick Tjin [Wed, 6 Nov 2013 18:16:56 +0000 (10:16 -0800)]
am
bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev
* commit '
bd9513f3b27a9a15a12474ff5b270abd69a013a1':
Add HSPA+ to BatteryStats
Patrick Tjin [Wed, 6 Nov 2013 18:12:47 +0000 (18:12 +0000)]
Merge "Add HSPA+ to BatteryStats" into klp-dev