Daniel Sandler
71988c81a3
am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
...
* commit '386165a3ae09b150165e8e7c310e194231071271':
Only show "charging" if the battery is really charging.
2012-11-30 07:29:46 -08:00
Daniel Sandler
386165a3ae
Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
2012-11-30 07:27:36 -08:00
Dirk Dougherty
6875b4385c
am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
...
* commit 'a4f67a88f421c454cb07a59e9ce5b0b720df55fc':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
2012-11-29 21:17:03 -08:00
Dirk Dougherty
a4f67a88f4
am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
...
* commit '49be1ef39cfa2c718cb56dee088338ea97019c11':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
2012-11-29 21:15:04 -08:00
Dirk Dougherty
49be1ef39c
Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
2012-11-29 21:11:24 -08:00
Baligh Uddin
02d29ff5fe
am a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'a1b3b99c7f1c53648b4d2e631a1042be27173cd1':
Import translations. DO NOT MERGE
2012-11-29 21:09:05 -08:00
Dirk Dougherty
2b286bb26b
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
...
Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
2012-11-29 21:07:41 -08:00
Baligh Uddin
cb21c8cc2b
am 2c2b232b: am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2c2b232b4135e1534b00fb2690c72c0dc9266b2f':
Import translations. DO NOT MERGE
2012-11-29 21:07:30 -08:00
Baligh Uddin
a1b3b99c7f
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-11-29 21:06:23 -08:00
Baligh Uddin
2c2b232b41
am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '2138e5c0f6b78e0e248945da498bd716c928505f':
Import translations. DO NOT MERGE
2012-11-29 21:06:04 -08:00
Baligh Uddin
2138e5c0f6
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-29 21:03:06 -08:00
Baligh Uddin
497a40e0b2
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-29 21:02:10 -08:00
Scott Main
ddf9c3fdce
am 48e794da: am 9748abb6: docs: add maps v2 announcement
...
* commit '48e794dac4135a626b8b2135874331ffe3ace34f':
docs: add maps v2 announcement
2012-11-29 19:07:26 -08:00
Scott Main
48e794dac4
am 9748abb6: docs: add maps v2 announcement
...
* commit '9748abb66865849840f9d36d7ab68eae0ce7357c':
docs: add maps v2 announcement
2012-11-29 19:05:20 -08:00
Scott Main
9748abb668
docs: add maps v2 announcement
...
Change-Id: Ibf9b7ac02ffc8f70b48bcede4df929ec089108c5
2012-11-29 18:24:56 -08:00
Dianne Hackborn
ed74c10f13
am aae329ef: Merge "Don\'t apply transformation fudge when not rotating." into jb-mr1.1-dev
...
* commit 'aae329ef0f68e30897faef55c86548dab0eadf37':
Don't apply transformation fudge when not rotating.
2012-11-29 17:56:58 -08:00
Dianne Hackborn
aae329ef0f
Merge "Don't apply transformation fudge when not rotating." into jb-mr1.1-dev
2012-11-29 17:53:47 -08:00
Dianne Hackborn
4b16969b00
Don't apply transformation fudge when not rotating.
...
There is this stupid fudge factor applied to window transformations
when doing a screen rotation animation. We need this when rotating,
but when not rotating it causes very visible artifacts. Historically
the non-rotation case only happened due to configuration changes, so
wasn't that big a deal. Now however that we use this when switching
users, it is more annoying. So get rid of it for such cases.
Change-Id: I6b343866c1bad9b16984b4a629917c2f1bb37b9e
2012-11-29 17:51:24 -08:00
Dianne Hackborn
40ca751ba0
am ebec2315: Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev
...
* commit 'ebec2315353941890471aa901e87f19f681d007a':
Always report user switched after unfreezing screen.
2012-11-29 16:41:44 -08:00
Dianne Hackborn
ebec231535
Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev
2012-11-29 16:38:23 -08:00
Zhihai Xu
ec7a8b6f74
am e1a867f6: Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev
...
* commit 'e1a867f68d3727908be1c2cfc90a5ba6a5785c17':
BluetoothManagerService call should allow SYSTEM_UID
2012-11-29 16:06:17 -08:00
Zhihai Xu
e1a867f68d
Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev
2012-11-29 16:03:49 -08:00
Winson Chung
c93d558a53
am 818b2f34: Merge "Fixing issue where you can still click on a widget on a side page. (Bug 7568412)" into jb-mr1.1-dev
...
* commit '818b2f341c7a5afc08c6d1d26469101f3885def0':
Fixing issue where you can still click on a widget on a side page. (Bug 7568412)
2012-11-29 16:01:34 -08:00
Winson Chung
818b2f341c
Merge "Fixing issue where you can still click on a widget on a side page. (Bug 7568412)" into jb-mr1.1-dev
2012-11-29 15:59:45 -08:00
Michael Jurka
d2de8033a3
am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev
...
* commit 'a8d63ec9f328e56d9ccad385f137a30fa104c1a7':
Disable adding keyguard widgets until setup is done
2012-11-29 15:54:47 -08:00
Michael Jurka
a8d63ec9f3
Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev
2012-11-29 15:51:13 -08:00
Zhihai Xu
6eb7652b04
BluetoothManagerService call should allow SYSTEM_UID
...
bug 7561429
Change-Id: I1483bfe1361f71c7ae3529ea496b33504b95413e
2012-11-29 15:41:04 -08:00
Dianne Hackborn
4d78abfca7
Always report user switched after unfreezing screen.
...
Change-Id: I58172896892a07e72a3430e56e4d2944d388c7c9
2012-11-29 15:10:18 -08:00
Robert Ly
8569af3011
am 5915f61e: am 830b23b7: docs: gms javadocs
...
* commit '5915f61e8b10e2a89d302f3c9bf2104c4abe1c07':
docs: gms javadocs
2012-11-29 14:23:35 -08:00
Robert Ly
5915f61e8b
am 830b23b7: docs: gms javadocs
...
* commit '830b23b76676542cbcb5ef3c60c869460d4c5466':
docs: gms javadocs
2012-11-29 14:22:13 -08:00
Robert Ly
a93d0e0930
am 64208d23: am aae17137: docs: update gms toc and landing pages
...
* commit '64208d23c95c16d1fb41b4dffdce554c198c5ee1':
docs: update gms toc and landing pages
2012-11-29 14:19:51 -08:00
Robert Ly
64208d23c9
am aae17137: docs: update gms toc and landing pages
...
* commit 'aae171371b044d4efe4b58589f3b04f000016cec':
docs: update gms toc and landing pages
2012-11-29 14:17:31 -08:00
Robert Ly
830b23b766
docs: gms javadocs
...
Change-Id: Ibcae03cab861c90a589f39a860889a3f4e6a55ad
2012-11-29 14:11:28 -08:00
Michael Jurka
fff5614cae
Disable adding keyguard widgets until setup is done
...
Bug: 7504154
Change-Id: I865f0139bb328e6b9b19493e0d8f9f086e2ebc38
2012-11-29 13:15:39 -08:00
Robert Ly
aae171371b
docs: update gms toc and landing pages
...
Change-Id: I2d55026d492356b70de2071c96786b6dadb5938a
2012-11-29 13:14:02 -08:00
Robert Ly
206979c9ac
am 8f1371af: am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev
...
* commit '8f1371aff392debf345027874f5fad4354137eed':
docs: fix bug 7628699
2012-11-29 13:07:02 -08:00
Robert Ly
8f1371aff3
am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev
...
* commit '64e4ed8d67376e519c2d0d5e70a1375f8a8760eb':
docs: fix bug 7628699
2012-11-29 13:04:23 -08:00
Robert Ly
64e4ed8d67
Merge "docs: fix bug 7628699" into jb-mr1-dev
2012-11-29 13:02:09 -08:00
Colin Cross
418af9323f
am 05db19bc: Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev
...
* commit '05db19bc55962374812775bf7d980d83ca4f6c3e':
trigger kernel blocked stack trace on system server watchdog
2012-11-29 12:49:46 -08:00
Colin Cross
05db19bc55
Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev
2012-11-29 12:47:54 -08:00
Colin Cross
5df1d871fe
trigger kernel blocked stack trace on system server watchdog
...
Bug b/7638530 may be caused by a kernel deadlock when killing
processes under low memory conditions. Write to /proc/sysrq-trigger
to get a kernel log of blocked tasks before killing the system server.
Bug: 7638530
Change-Id: I60df324ad4affdadbf13650099dc4dfb38722420
2012-11-29 12:44:09 -08:00
Daniel Sandler
fe0e1e445f
Only show "charging" if the battery is really charging.
...
If there's a charge problem (battery health/temperature out
of spec, or low charging current), the lockscreen and status
bar should not indicate that charging is occurring.
(Previously we showed "Charging" and a lightning bolt any
time the device was plugged in.)
Bug: 7509976
Change-Id: I27ec0e2cec1307fbc6ef262dd5181a4db6d3bed0
2012-11-29 15:11:50 -05:00
Dianne Hackborn
ed8c323a6c
am 38e84700: Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
...
* commit '38e847004978031c2b914714e92bc5407ba3ce65':
Fix issue #7585876 : When changing the font settings, the movie...
2012-11-29 12:08:41 -08:00
Dianne Hackborn
38e8470049
Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
2012-11-29 12:05:33 -08:00
Dianne Hackborn
7ac8bbddfc
Fix issue #7585876 : When changing the font settings, the movie...
...
...just keeps attempting to load and doesn't play on the TV
Change-Id: Ifcdc969a037a113224632f907d55f60a168dd05a
2012-11-29 11:59:58 -08:00
John Spurlock
43658bae9c
am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev
...
* commit '143d73dab5bf3fe6b8835660543d3d03e781618f':
Fix multiuser bug in StatusBarManagerService.
2012-11-29 11:48:48 -08:00
John Spurlock
143d73dab5
Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev
2012-11-29 11:45:57 -08:00
John Spurlock
1428384c62
am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev
...
* commit '958343c19f8a87dfb8967431684da3239ac20272':
Fix for navbar back/home appearing in keyguard (multiuser).
2012-11-29 11:41:55 -08:00
John Spurlock
958343c19f
Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev
2012-11-29 11:40:30 -08:00
Scott Main
3aabc56425
am bf0e87a4: am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev
...
* commit 'bf0e87a41bff9905fd8d623bc5c2b106f372bdc0':
docs: update landing page for Google Services
2012-11-29 11:32:56 -08:00