Jinsuk Kim
8b9ac4efb4
am 7747bf8d: am d1cd4053: Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev
...
* commit '7747bf8df1ae82f7e15639870b7f984d2a25b8eb':
CEC: Hook up device select API to MHL device RAP
2014-08-20 05:49:23 +00:00
Jeff Brown
961ccb13bc
am 012ddc53: am 53509444: Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev
...
* commit '012ddc53f7da5c50606e689cb6a7d87779076739':
Remove incomplete media router API. (DO NOT MERGE)
2014-08-20 03:26:50 +00:00
Adam Powell
6240d0bc3f
am 04fd54d4: am 330a5bec: Merge "Update text selection handles to have a minimum touch target size." into lmp-dev
...
* commit '04fd54d4c543e6516fb2bfd823f53e376e97197d':
Update text selection handles to have a minimum touch target size.
2014-08-20 03:10:42 +00:00
Alan Viverette
c9b499b4e9
am e330a384: am 44b61fde: Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev
...
* commit 'e330a384a067f95ed1e89d83f82ea848301040f7':
Draw accessibility focus in View rather than ViewRootImpl
2014-08-20 00:05:47 +00:00
Igor Murashkin
c88cf74d40
am bdf49aa1: am 1a054ea8: Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev
...
* commit 'bdf49aa1211d87c4c25571d70a5669e1622318ba':
camera2: legacy: disable shutter sounds unconditionally via camera2 api
2014-08-19 23:44:34 +00:00
Alan Viverette
3ae3e02022
am 0118f49a: am 7617ae5f: Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev
...
* commit '0118f49a9edf5a0f64a3967539f9c3a474cd0db7':
Fix alignParentRight/End in RelativeLayout
2014-08-19 23:44:21 +00:00
George Mount
914e2cc89a
am 31894079: am 273f568d: Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev
...
* commit '3189407931c46c4440ff040f494e8f027e771812':
Fixed ChangeBounds matching against the wrong View.
2014-08-19 23:44:16 +00:00
Alan Viverette
7622f46c78
Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev
2014-08-19 21:23:09 +00:00
Alan Viverette
54509d5a68
Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev
2014-08-19 21:23:09 +00:00
Alan Viverette
567e44797b
Fix alignParentRight/End in RelativeLayout
...
BUG: 17136816
Change-Id: If7edb2e0216384429f4caf7e9aae01c09ddd8be4
2014-08-19 15:41:51 -07:00
George Mount
4d1ecf5daf
Fixed ChangeBounds matching against the wrong View.
...
ChangeBounds must ensure that its parents match to use reparent,
but it used instance and ID matching. Matching can now be
done in several ways and that is insufficient.
Change-Id: Ic0432cd06549e4dc9ba49f33b0a6a42082e29dc1
2014-08-19 14:39:47 -07:00
Adam Lesinski
7c97b74a05
am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev
...
* commit '1f5eb661b38dee97c65ddfb7a7dc720afbcca3bb':
Add Shell command to set AppOps permissions
2014-08-19 21:08:01 +00:00
Alan Viverette
997aa40645
Draw accessibility focus in View rather than ViewRootImpl
...
This ensures that the focus rect position is correct when running in
render thread accelerated mode. Also adds a missing call to draw the
overlay.
BUG: 16796647
BUG: 17063342
Change-Id: I377e5eaea89d3f20c8c7e82c264a0f106021d58b
2014-08-19 20:36:07 +00:00
George Mount
ed526817bc
am cc3e585f: am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev
...
* commit 'cc3e585f57ff509531f19e3dc361e9c89177ff60':
Set start transform before animator starts.
2014-08-19 20:05:52 +00:00
Lorenzo Colitti
56d4c18e2f
am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev
...
* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
Stop using LinkProperties for static configuration.
2014-08-19 19:37:53 +00:00
Igor Murashkin
9423d558fd
am 2cfef50a: am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
...
* commit '2cfef50a34cbffa77f15ee1e5fe962b8bc6659ed':
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
2014-08-19 18:54:48 +00:00
Igor Murashkin
fcfa4c9506
am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev
...
* commit '5e27ea673ae91907f7b2316a6008db629356178c':
camera2: (Legacy) Add control.sceneMode = DISABLED to templates
2014-08-19 18:54:43 +00:00
George Mount
e36b9aef0e
am 5bc2737b: am 2d0cb7d1: Add a way to get Transitions from a TransitionSet.
...
* commit '5bc2737b2a98da670e7e8786c43df916a45f7eb2':
Add a way to get Transitions from a TransitionSet.
2014-08-19 16:58:32 +00:00
Nicolas Prevot
880ac4a37e
am 07e5e66c: am 0587c834: When notify uri changes, changing the way we retrieve the userId.
...
* commit '07e5e66cccfe6c442d7476525ea6a73669ca84d2':
When notify uri changes, changing the way we retrieve the userId.
2014-08-19 16:43:56 +00:00
George Mount
7f15164ecb
Add a way to get Transitions from a TransitionSet.
...
Bug 17113732
Change-Id: I0a157a59448e66560ba2252709971131c5dea401
2014-08-19 16:43:06 +00:00
Nicolas Prevot
ec4bb45a8c
When notify uri changes, changing the way we retrieve the userId.
...
Changing from UserHandle.getCallingUserId() to UserHandle.myUserId().
This makes the DocumentProvider work across users.
BUG: 16126891
Change-Id: I8ede64f2087894bb85eff5286803cdebd57e7137
2014-08-19 17:09:09 +01:00
Kenny Guy
7efc392b37
am 74c1c9db: am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev
...
* commit '74c1c9db0c20706a3eb571309bb7888a16495808':
First part of renaming methods in LauncherApps.
2014-08-19 11:23:06 +00:00
Jinsuk Kim
c98889df16
am 41869802: am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev
...
* commit '418698026e0a5303dc588c99efa64e3a9e401d47':
CEC: Invoke events listener upon MHL device state change
2014-08-19 06:15:40 +00:00
Jon Miranda
16adbb4222
am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev
...
* commit '4a5ac7db49117b5d14e82caca68405949eccfec5':
Exposes style and theme data, adds developer option.
2014-08-19 03:10:22 +00:00
Igor Murashkin
7064dd65d8
Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev
2014-08-19 02:43:23 +00:00
Igor Murashkin
6653362f6b
camera2: legacy: disable shutter sounds unconditionally via camera2 api
...
Bug: 17109582
Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf
2014-08-19 15:11:31 -07:00
Adam Lesinski
1bd805c943
Merge "Add Shell command to set AppOps permissions" into lmp-dev
2014-08-19 02:43:23 +00:00
Adam Lesinski
b5cf61be7c
Add Shell command to set AppOps permissions
...
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
2014-08-19 11:27:19 -07:00
Igor Murashkin
3a6eba01c4
Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
...
Return empty array since no implementation-defined sizes are supported
Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
2014-08-19 10:51:30 -07:00
Igor Murashkin
ae0da7a81c
Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev
2014-08-19 02:43:23 +00:00
Igor Murashkin
981952d07a
camera2: (Legacy) Add control.sceneMode = DISABLED to templates
...
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
2014-08-19 11:04:31 -07:00
Dianne Hackborn
178eea5547
am 900eb151: am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev
...
* commit '900eb15179fa1cbf58231715c9af3f65115631c1':
Temporary: raise overflow limit, print all wake locks.
2014-08-19 01:03:04 +00:00
Michael Wright
15253d0aea
am 9df4c42a: am e835a130: Merge "Persist Show IME option." into lmp-dev
...
* commit '9df4c42aaada081a128671f2a3f6e06a5effa5cc':
Persist Show IME option.
2014-08-19 00:48:56 +00:00
Michael Wright
37869daf5e
am 0cddd377: am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev
...
* commit '0cddd377c9976b091457118a9a81b4a405958c2e':
Update MenuItem#setShortcut docs
2014-08-19 00:48:51 +00:00
destradaa
b35e41e122
am 8e9d264e: am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev
...
* commit '8e9d264ef76061bbc33f79cbada560c5461c64b8':
Add @SystemApi annotation to Geofence Hardware types.
2014-08-19 00:09:06 +00:00
arete
9dae3b831a
am d4f0067e: am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev
...
* commit 'd4f0067eee8db6f0ec581d01a5611174761423c0':
Expose system apis for backup transport migration
2014-08-18 23:54:09 +00:00
Adam Powell
2b74dfa1ac
am 9c7cf696: am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev
...
* commit '9c7cf696ecb286c90ae19aaaa1e9080a9fb00b4e':
Fix a bug propagating navigation button events from ToolbarActionBar
2014-08-18 23:37:07 +00:00
Michael Wright
468fef6870
Merge "Persist Show IME option." into lmp-dev
2014-08-18 23:27:42 +00:00
arete
4220a9a9f6
Merge "Expose system apis for backup transport migration" into lmp-dev
2014-08-18 23:27:42 +00:00
Jeff Sharkey
fbc5d259db
am 442dcce1: am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev
...
* commit '442dcce17ee6f656c8a0ec872f3c6730dd603796':
Progress towards staging ASECs.
2014-08-18 23:16:36 +00:00
Alan Viverette
6d58ab0346
am 3d3783ec: am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev
...
* commit '3d3783ec27d7b3aafbd08d6695d37543e9a337f8':
Update fast scroller preview for Material
2014-08-18 23:16:31 +00:00
George Mount
cd02b48b3d
Merge "Set start transform before animator starts." into lmp-dev
2014-08-18 21:31:41 +00:00
George Mount
dbe3655c0b
Set start transform before animator starts.
...
Bug 16958319
ChangeImageTransform was waiting until the animator started
before setting the image matrix. Animators with a
start delay would leave the ImageView with the final transform
before the animator started.
Change-Id: I5ebc03b58a8697da3edf4a01c8906d60e7938f44
2014-08-19 16:43:45 +00:00
Jon Miranda
611f8f17f3
Merge "Exposes style and theme data, adds developer option." into lmp-dev
2014-08-18 21:31:41 +00:00
Jon Miranda
836c0a8b94
Exposes style and theme data, adds developer option.
...
Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.
Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.
Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
2014-08-18 18:32:53 -07:00
Michael Wright
8b987196ca
Merge "Update MenuItem#setShortcut docs" into lmp-dev
2014-08-18 21:31:41 +00:00
Alan Viverette
d59c585588
Merge "Update fast scroller preview for Material" into lmp-dev
2014-08-18 21:31:41 +00:00
Adam Powell
8f4a21e466
Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev
2014-08-18 21:00:53 +00:00
Adam Powell
14e1afe0d8
Fix a bug propagating navigation button events from ToolbarActionBar
...
Add a simple internal wrapper for dealing with window callback events.
This should also make working with things like action modes from
ToolbarActionBar significantly easier in later changes.
Bug 16980711
Change-Id: I2c3d7525489a21847f4af9b80f6ebf9b34b4dd58
2014-08-18 15:58:23 -07:00