Bryce Lee
1ae5dc12d0
am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev
...
* commit 'ca7f9a4d4eaa4a14c45199a586ec25efee7407fa':
Add config to control going to sleep when entering theater mode.
2014-11-05 19:00:56 +00:00
Daniel Sandler
9647bdd97e
am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev
...
* commit '70bbbd32beefbb8e5c2e2dfa7a417274f80e2da2':
More flexible intent extra parsing.
2014-11-05 19:00:51 +00:00
Dan Sandler
ac8dbdafea
Merge "Materialize default app icon." into lmp-mr1-dev
2014-11-05 18:58:14 +00:00
RoboErik
5468f292f3
am acbdb4fe: am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev
...
* commit 'acbdb4fe5d2e4bd7729f3685b2d78421d5d13cc8':
Post volume requests to the handler thread in MediaSession
2014-11-05 18:55:53 +00:00
RoboErik
6651cd3830
am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
...
* commit 'e2b8dab0d0f541e4a014536f8088ac51afc06c49':
Add extras to the PlaybackState
Add setRatingType to MediaSession
2014-11-05 18:55:46 +00:00
Jeff Davidson
a820564d9c
am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev
...
* commit 'd9685fac35c1c3ba797eb9e534ec15888aaa3a8b':
Update network selections on capability change.
2014-11-05 18:55:40 +00:00
Filip Gruszczynski
cac8e4a5aa
am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev
...
* commit '093e98908743eb37104a280541a060dcd46351d0':
Automatic brightness using ALS while dozing.
2014-11-05 18:55:34 +00:00
Ricardo Cervera
caecc4ae3d
am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21
...
* commit 'df37d45f1311dcbfbcc58b3ff81f3df56c46fcdd':
docs: Add instructions to attach debugger to a running process.
2014-11-05 18:54:12 +00:00
Bryce Lee
ca7f9a4d4e
am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev
...
* commit '5a818e55a7faee421567eb037ac4e42f20bca0c4':
Add config to control going to sleep when entering theater mode.
2014-11-05 18:54:06 +00:00
Daniel Sandler
70bbbd32be
Merge "More flexible intent extra parsing." into lmp-mr1-dev
2014-11-05 18:53:44 +00:00
Andrew Solovay
8d7d7b448f
am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
...
* commit '56576838a8e8c4f44f8df13cc40295a918540b86':
docs: Removed broken link to non-existent method.
2014-11-05 18:52:27 +00:00
Ricardo Cervera
b2f0f3514c
am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
...
* commit 'b4125d1e0bbf1ce90d0bfb03e5e068180bbb6b20':
docs: Add instructions to attach debugger to a running process.
2014-11-05 18:52:23 +00:00
Dan Albert
97014933f0
Merge "Fix a wonderful copy/paste time bomb."
2014-11-05 18:50:10 +00:00
RoboErik
acbdb4fe5d
am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev
...
* commit '9af44ddf0367c542d6c1db6060456bd72f3c83ca':
Post volume requests to the handler thread in MediaSession
2014-11-05 18:49:54 +00:00
RoboErik
e2b8dab0d0
am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
...
* commit '5604a85ac61eb01794cf1dd9ea83321bcf93b57a':
Add extras to the PlaybackState
Add setRatingType to MediaSession
2014-11-05 18:49:49 +00:00
Jeff Davidson
d9685fac35
am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev
...
* commit 'ea651a4fbf274d229ead0185286c94b6e823d605':
Update network selections on capability change.
2014-11-05 18:49:44 +00:00
Filip Gruszczynski
093e989087
am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev
...
* commit '34afdf0276044f7d40c58df65dd13b9cb774d7c6':
Automatic brightness using ALS while dozing.
2014-11-05 18:49:39 +00:00
Andrew Solovay
56576838a8
am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
...
* commit 'd9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
docs: Removed broken link to non-existent method.
2014-11-05 18:47:17 +00:00
Craig Mautner
276a6eb879
When keyguard exits use same anim for all windows
...
The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.
Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.
This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.
(Also refactorings to eliminate redundant code and unnecessary
variables.)
Fixes bug 15991916.
Change-Id: I844d102439b6eda8c912108431916e04b12f7298
2014-11-05 10:47:14 -08:00
Ricardo Cervera
b4125d1e0b
am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
...
* commit '58f1200c333deea72ed6e095587f0bcb1fb65ce3':
docs: Add instructions to attach debugger to a running process.
2014-11-05 18:47:13 +00:00
Rich Slogar
1afa82dce0
docs:remove sdk/ndk note
...
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
2014-11-05 10:46:50 -08:00
RoboErik
9af44ddf03
Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev
2014-11-05 18:29:32 +00:00
Jeff Davidson
f92fc1ca65
Fix incorrect doc for WifiInfo#getSSID().
...
This method will never return null. It may return "<unknown ssid>" if
no network is currently connected.
Change-Id: Iae09a6b2376e47c2d010f8d05750a16361510cca
2014-11-05 10:26:00 -08:00
RoboErik
5604a85ac6
Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
...
* changes:
Add extras to the PlaybackState
Add setRatingType to MediaSession
2014-11-05 18:26:00 +00:00
Andrew Solovay
d9ceae8f97
Merge "docs: Removed broken link to non-existent method." into lmp-docs
2014-11-05 18:14:05 +00:00
Tyler Gunn
d331e4ec26
Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev automerge: 4255ec5
...
automerge: 0bfb97c
* commit '0bfb97cddfadcc0d580bca78c4368efac4edd23e':
Support disconnecting conference participants from conference.
2014-11-05 18:08:37 +00:00
Jorim Jaggi
80ae285010
Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c
...
automerge: 80a28fe
* commit '80a28fe8d69cbf629a6f8cca23de9fc6e7673326':
Fix janky in transition doze -> lockscreen
2014-11-05 18:06:27 +00:00
Andres Morales
a4341f9cf3
Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev automerge: 36531b3
...
automerge: 3bc103b
* commit '3bc103b8dbcacf908e6512b805c89a399a460be9':
Only allow USER_OWNER to access PDB and change OEM unlock ability
2014-11-05 18:05:14 +00:00
George Mount
7291d7b2c5
Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674
...
automerge: dd185b6
* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
Fix javadoc.
2014-11-05 18:03:51 +00:00
Jeff Davidson
ea651a4fbf
Merge "Update network selections on capability change." into lmp-mr1-dev
2014-11-05 17:41:36 +00:00
Filip Gruszczynski
34afdf0276
Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev
2014-11-05 17:39:34 +00:00
Tyler Gunn
0bfb97cddf
Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev
...
automerge: 4255ec5
* commit '4255ec5c57ace18b0a78ebcbf0d573213123e586':
Support disconnecting conference participants from conference.
2014-11-05 17:38:45 +00:00
Selim Cinek
9bd9d0c96a
Fixed a bug where the HUNs were not clickable
...
Also improved the edgeswipehelper to use 45 degree
touch disambiguation.
Bug: 18102199
Change-Id: I153e094d5d86439ae048137fc5eac47966b12ca5
2014-11-05 18:12:27 +01:00
Selim Cinek
1a521f3ea8
Fixed a bug that the notifications were not animating when reset
...
Also made sure that the touch event is never filtered when its a
heads up view.
Bug: 18188693
Change-Id: Ic5de3e36c785d2cf890936322820b739a0a1b107
2014-11-05 18:12:15 +01:00
Ricardo Cervera
df37d45f13
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
...
automerge: 25a4e21
* commit '25a4e21e13217708e9ff99beb21f88151ea2cbd4':
docs: Add instructions to attach debugger to a running process.
2014-11-05 17:08:37 +00:00
Tyler Gunn
4255ec5c57
Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev
2014-11-05 17:03:13 +00:00
Dan Sandler
d29149d2ee
Materialize default app icon.
...
Bug: 17999428
Change-Id: Ib7430993fc44051c70a802442dce15ca4cd592d4
2014-11-05 12:02:22 -05:00
Ricardo Cervera
58f1200c33
Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
2014-11-05 17:00:10 +00:00
Ricardo Cervera
25a4e21e13
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
2014-11-05 16:58:23 +00:00
Bryce Lee
5a818e55a7
Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev
2014-11-05 16:41:40 +00:00
Jorim Jaggi
80a28fe8d6
Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev
...
automerge: 09ba32c
* commit '09ba32c0ba9306bafa25e27a2fa7d6e53e9be715':
Fix janky in transition doze -> lockscreen
2014-11-05 16:37:13 +00:00
Andres Morales
3bc103b8db
Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev
...
automerge: 36531b3
* commit '36531b33b8e5bb249010f2414ed41d244c571464':
Only allow USER_OWNER to access PDB and change OEM unlock ability
2014-11-05 16:36:06 +00:00
George Mount
dd185b657d
Merge "Fix javadoc." into lmp-mr1-dev
...
automerge: 8b26674
* commit '8b26674aa139965005ff3ba7d284d7d557c2de61':
Fix javadoc.
2014-11-05 16:34:41 +00:00
Jorim Jaggi
09ba32c0ba
Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev
2014-11-05 16:17:33 +00:00
Andres Morales
36531b33b8
Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev
2014-11-05 16:01:24 +00:00
John Spurlock
96171f08c1
Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9
...
automerge: 513f260
* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
Zen: Create a new exit condition for "next alarm".
2014-11-05 15:42:30 +00:00
John Spurlock
b16f943743
Merge "QS: Toggle tile icon animations." into lmp-mr1-dev automerge: 2face5e
...
automerge: 055acca
* commit '055acca7c8691921572f8e9845bd4d46b96c7251':
QS: Toggle tile icon animations.
2014-11-05 15:41:12 +00:00
George Mount
8b26674aa1
Merge "Fix javadoc." into lmp-mr1-dev
2014-11-05 15:22:43 +00:00
John Spurlock
513f260200
Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
...
automerge: 0bdefb9
* commit '0bdefb9953fd51c86f81a6033a00926a63916065':
Zen: Create a new exit condition for "next alarm".
2014-11-05 15:20:12 +00:00
John Spurlock
055acca7c8
Merge "QS: Toggle tile icon animations." into lmp-mr1-dev
...
automerge: 2face5e
* commit '2face5e2e86cb7850c2ce67306f5aad04af6f597':
QS: Toggle tile icon animations.
2014-11-05 15:19:02 +00:00