Alan Viverette
b19fe38840
Merge "Update toggle switch asset to include content area" into lmp-dev
2014-08-19 22:53:25 +00:00
Alan Viverette
a5e1301bf5
Update toggle switch asset to include content area
...
Remove optical bounds workaround from NinePatchDrawable, which was
incorrect anyway since we were missing a content area rather than
missing padding.
BUG: 17114103
Change-Id: I51461be666f59534dfdea7ab79bc867ee3eb3c92
2014-08-19 16:55:47 -07:00
ztenghui
f2b6fdce16
am 6e1a41fa: Merge "Update indeterminate linear progress bar" into lmp-dev
...
* commit '6e1a41fa25a5cc6f6fb077b292d24e0f484e2e14':
Update indeterminate linear progress bar
2014-08-19 22:50:16 +00:00
Chris Craik
ec10276136
am 06b155eb: Merge "Update setShadowLayer doc" into lmp-dev
...
* commit '06b155eb510a6087035c474992b43111700f69bb':
Update setShadowLayer doc
2014-08-19 22:50:11 +00:00
Chris Craik
dee4e296e1
am 5bdd7e48: Merge "Early reject drawText calls that will not draw" into lmp-dev
...
* commit '5bdd7e48306c32fe3d4ffdb0c92e539245937908':
Early reject drawText calls that will not draw
2014-08-19 22:50:06 +00:00
Jae Seo
719c8cd3c0
am 785c8732: am 03d07be7: API Review: android.media.tv
...
* commit '785c87329d928c76a3fa951d3a8183f8a470b31e':
API Review: android.media.tv
2014-08-19 22:36:27 +00:00
Jae Seo
563e7eca8c
am 03d07be7: API Review: android.media.tv
...
* commit '03d07be733caa36262ef8c9c3aef400d9bca118b':
API Review: android.media.tv
2014-08-19 22:31:08 +00:00
Adam Powell
a74e6b49a6
am 38ec99a8: am 09662e68: Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev
...
* commit '38ec99a8b18c503a46165c23f2cf25400ee89ffc':
Make Toolbars (and Toolbar-based ActionBars) have constant text size
2014-08-19 22:28:25 +00:00
Jae Seo
1553a528a5
API Review: android.media.tv
...
TvView:
- Instead of ERROR_INPUT_DISCONNECTED, a separate callback
onDisconnected; change onError to onConnectionFailed.
Bug: 17114406
Change-Id: I9457ac81c883610f96954494bf75a4e78e53383f
2014-08-19 22:20:22 +00:00
Adam Powell
31ec9a3fec
am 09662e68: Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev
...
* commit '09662e68baf9748ff9bedcfb0fa59e388ec54588':
Make Toolbars (and Toolbar-based ActionBars) have constant text size
2014-08-19 22:19:41 +00:00
Ihab Awad
4c5cbf9a2e
am b5d4eaae: am 940e67a8: Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev
...
* commit 'b5d4eaae622e2f885235de67568dc9b40ffbb502':
ConnectionService API has only one completed callback (1/3)
2014-08-19 21:37:33 +00:00
Ihab Awad
f0bad75f74
am 940e67a8: Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev
...
* commit '940e67a88bb5cc6f97afa4f0a703e428d55c537f':
ConnectionService API has only one completed callback (1/3)
2014-08-19 21:31:34 +00:00
Jae Seo
3acf66f558
Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev
2014-08-19 21:23:09 +00:00
Deepanshu Gupta
92973b8f37
Merge "Add time to status bar and fix wifi icon." into lmp-dev
2014-08-19 21:23:09 +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
3ec10e72b9
Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev
2014-08-19 21:23:09 +00: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
Winson Chung
20c790f1f1
am 08d36ec1: am a4f6df0f: Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev
...
* commit '08d36ec134c83b25055acf9384fbd65c6f6d1377':
Adding shadows to the focus state and fab button. (Bug 16950262)
2014-08-19 21:08:11 +00:00
Winson Chung
60c1b9e4ed
am 217a7134: am e6c940f7: Small tweaks to the stack curve and header transition. (Bug 16656169)
...
* commit '217a71345650439f6f5b0407fae797f8f9618131':
Small tweaks to the stack curve and header transition. (Bug 16656169)
2014-08-19 21:08:06 +00: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
Amith Yamasani
6450f683fd
am bb93703d: am 1e8ba427: Merge "Rephrase the Exit guest action and dialog text" into lmp-dev
...
* commit 'bb93703df5374205ddb2b09d138d571b5ed117d3':
Rephrase the Exit guest action and dialog text
2014-08-19 21:07:56 +00:00
Tim Murray
053e36dfa3
am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev
...
* commit 'c9c7820604158bc6c6ba0e413cc48c8e1c0a6366':
Stop sign-extending RS IDs.
2014-08-19 21:07:47 +00:00
Tim Murray
d0080ee004
am 7fa25bc1: am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev
...
* commit '7fa25bc1269d3ba2db79f32acb17d80194cbadce':
Fix IO_INPUT with 64-bit.
2014-08-19 21:07:42 +00:00
Winson Chung
74c86ebd64
am a4f6df0f: Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev
...
* commit 'a4f6df0f51adc0ae69fa845ceb7d0a20713cc1b2':
Adding shadows to the focus state and fab button. (Bug 16950262)
2014-08-19 20:55:14 +00:00
Winson Chung
0fc0748e38
am e6c940f7: Small tweaks to the stack curve and header transition. (Bug 16656169)
...
* commit 'e6c940f7a6a831e1e0a1bf18f9e57b0408dc72ef':
Small tweaks to the stack curve and header transition. (Bug 16656169)
2014-08-19 20:55:09 +00:00
Adam Lesinski
6e6bc85c1c
am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev
...
* commit '960ab6de31ddd1a92e7a2e1829a2f2cd9b209c13':
Add Shell command to set AppOps permissions
2014-08-19 20:55:05 +00:00
Amith Yamasani
3dbbd63410
am 1e8ba427: Merge "Rephrase the Exit guest action and dialog text" into lmp-dev
...
* commit '1e8ba427abacc928f018ceaf21a9278de886b43d':
Rephrase the Exit guest action and dialog text
2014-08-19 20:47:10 +00:00
Winson Chung
abedcab44c
Small tweaks to the stack curve and header transition. (Bug 16656169)
...
Change-Id: I96120063a66f267ad0b6a39b3dd020bc030083b8
2014-08-19 20:45:36 +00:00
Tim Murray
b616aa78a1
am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev
...
* commit '9ba9298e028e32eb6b1058dfb47eeae5fda164c4':
Stop sign-extending RS IDs.
2014-08-19 20:39:05 +00:00
Tim Murray
5e8e9c336f
am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev
...
* commit '3c02b0201c4e57bb493a926ee79aaf80fbd1ff7b':
Fix IO_INPUT with 64-bit.
2014-08-19 20:39: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
John Spurlock
07caa64de7
am 2e6222fe: am cb877145: Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev
...
* commit '2e6222fed9bacc16832240ac63223f913f61055a':
Zen: Remove "allow disable" filter from noman.
2014-08-19 20:34:23 +00:00
John Spurlock
3f5b887cba
am cb877145: Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev
...
* commit 'cb8771459629d1801cbecb1bad1754351e24f083':
Zen: Remove "allow disable" filter from noman.
2014-08-19 20:26:46 +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
George Mount
3485d63b07
am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev
...
* commit '793b08cd65f98edb48fd6e3dae440b0d71405567':
Set start transform before animator starts.
2014-08-19 19:58:10 +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
Chris Craik
8380cedda2
am 8a55b117: am fc1bf228: Merge "Don\'t cast shadows from gradients with transparent parts" into lmp-dev
...
* commit '8a55b117f8f787c7946bc9ac98dfe3e2e01e4f52':
Don't cast shadows from gradients with transparent parts
2014-08-19 19:37:48 +00:00
Lorenzo Colitti
f049f56b70
am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev
...
* commit '14152c7994d690a5ee0a0aad19701557407a4d70':
Stop using LinkProperties for static configuration.
2014-08-19 19:29:11 +00:00
Chris Craik
b38934179c
am fc1bf228: Merge "Don\'t cast shadows from gradients with transparent parts" into lmp-dev
...
* commit 'fc1bf228ec27ca3a1fd2d570650a003f0045a64b':
Don't cast shadows from gradients with transparent parts
2014-08-19 19:29:07 +00:00
Jesse Hall
9d4fd82c83
am 7deebad3: am d30eb64f: am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit '7deebad390b42b8f6e24723120d31147c3e23701':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 19:25:34 +00:00
Shishir Agrawal
f055a1124e
am 8fa2b622: am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev
...
* commit '8fa2b622dc6c367d56cacefd0fb4821235e7d24d':
Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
2014-08-19 19:25:28 +00:00
Jesse Hall
bebaa8c470
am d30eb64f: am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit 'd30eb64f61f1cacb1bfca1be512bc1d208206f08':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 19:16:50 +00:00
Shishir Agrawal
426fb16355
am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev
...
* commit '0ec424c13d07bc59632bc85985ab0b5fd8ae0dec':
Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
2014-08-19 19:16:45 +00:00
Jesse Hall
efa5a01dc6
am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit '87978406b405cafc773703b7c849e372339527b8':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 19:12:08 +00:00
Jae Seo
47b9e4afc9
TIF: Add the video frame rate information to TvTrackInfo
...
Bug: 16187997
Change-Id: I25d5489e42502fa8f2537aadc205bb4203980fb2
2014-08-19 12:02:16 -07: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
Igor Murashkin
7940bde7eb
am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
...
* commit '77af33f81d2cbef1580a103c4efda6829f20c7e1':
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
2014-08-19 18:42:38 +00:00