OSDN Git Service
John Reck [Thu, 7 May 2015 20:14:15 +0000 (13:14 -0700)]
Remove SkBitmap from ResourceCache
Bug:
18928352
Fully-proper refcounting via SkBitmap/SkPixelRef, no more
side-channel refcounting via ResourceCache. Makes HWUI
more resilient to the bitmap being modified as well as
the SkBitmap's info & rowBytes() is updated every time
a DisplayList is recorded instead of relying on buggy
cache eviction logic
Change-Id: I2e8292d62ab6c257a2cfa1542387bf2bf1ade816
John Reck [Thu, 7 May 2015 16:16:14 +0000 (16:16 +0000)]
Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-dev
Paul Jensen [Thu, 7 May 2015 15:30:46 +0000 (15:30 +0000)]
Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev
Paul Jensen [Thu, 7 May 2015 14:44:32 +0000 (10:44 -0400)]
Avoid NPE when sendMessage is called after disconnect.
This avoids an NPE that could occur when:
1. disconnect() is called
2. sendMessage() is called but encounters a RemoteException
3. replyDisconnected() will attempt to dereference mSrcHandler
There does not appear to be any callers that rely on the NPE.
All callers erase their reference to the AsyncChannel after
calling disconnect(), except for NetworkAgentInfo which can
cause ConnectivityService to crash. This fix addresses that.
bug:
20647016
Change-Id: I89864885dc3371941407a036b7b7647e0ec037b8
George Mount [Thu, 7 May 2015 14:34:56 +0000 (14:34 +0000)]
Merge "Add CallbackRegistry." into mnc-dev
George Mount [Thu, 7 May 2015 14:34:01 +0000 (14:34 +0000)]
Merge "Fix crash during Activity Transition with TextureView." into mnc-dev
Neil Fuller [Thu, 12 Feb 2015 10:13:45 +0000 (10:13 +0000)]
Remove FloatMath methods from the API
Also removing FloatMathTest. The tests are being
moved into a legacy CTS suite.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I397fd6bcc4d988db6301245f9d47460bd6c28821
Jeff Brown [Thu, 7 May 2015 08:00:02 +0000 (08:00 +0000)]
Merge "Remove incomplete media router API." into mnc-dev
Jinsuk Kim [Thu, 7 May 2015 07:12:18 +0000 (07:12 +0000)]
Merge "CEC: Make wakeup on hotplug optional" into mnc-dev
Joe Fernandez [Thu, 7 May 2015 06:42:05 +0000 (06:42 +0000)]
am
b53420d0: am
e7866887: docs: M Preview landing page
* commit '
b53420d02def4277cf5b8a04da289b4291a9f24a':
docs: M Preview landing page
Joe Fernandez [Thu, 7 May 2015 06:29:57 +0000 (06:29 +0000)]
am
e7866887: docs: M Preview landing page
* commit '
e78668876ed0dfc25fac604b5048509f72d92c53':
docs: M Preview landing page
Joe Fernandez [Thu, 7 May 2015 00:15:03 +0000 (17:15 -0700)]
docs: M Preview landing page
Change-Id: Ib0e49713f105823898ca5f76d6d6eb4fad54df5e
Jinsuk Kim [Thu, 7 May 2015 03:12:55 +0000 (12:12 +0900)]
CEC: Make wakeup on hotplug optional
Added a new system property to make the feature optional. True
by default.
Bug:
20897914
Change-Id: I8bfca5144b802b95361e63b29abd6371971c7dbb
Yohei Yukawa [Thu, 7 May 2015 05:39:17 +0000 (05:39 +0000)]
Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
Nitin Arora [Wed, 29 Apr 2015 19:35:03 +0000 (12:35 -0700)]
Bluetooth: Ensure Bluetooth interface handle is valid
This change adds null checks to Bluetooth interface handle to prevent
using null references when BluetoothService is not up. Also removed
the callbacks for the intermediate state removed for now as they are
not being used.
Change-Id: I0e72ff4da467a8bcf5a4e5ac48d8558e7f308c7e
Seigo Nonaka [Thu, 7 May 2015 04:04:13 +0000 (21:04 -0700)]
Retry "Always show auxiliary subtypes from NavBar keyboard icon."
This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was
reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build
breakage in 'layoutlib' target, with a proper fix.
Hereafter the original CL description is repeated.
The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon. However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI. Auxiliary subtypes should not
be listed there(Id7cf5d122). Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution. If a physical keyboard is connected, the soft input may be
gone. As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.
To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.
Bug:
20763994
Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
Jeff Brown [Thu, 7 May 2015 04:00:06 +0000 (21:00 -0700)]
Remove incomplete media router API.
This time not also accidentally deleting frameworks/base/Android.mk.
*sigh*
Bug:
20641986
Change-Id: I2e43ab1fdf4201fec4d5a5b73c04f27a4a848630
Bart Sears [Thu, 7 May 2015 03:23:44 +0000 (03:23 +0000)]
Merge "Revert "Remove incomplete media router API."" into mnc-dev
Bart Sears [Thu, 7 May 2015 03:23:20 +0000 (03:23 +0000)]
Revert "Remove incomplete media router API."
This CL has broken all builds on mnc-dev.
Reverting until Jeff can take a look at it.
This reverts commit
2e5a2051de54e64612e1357d4534c7ec851aa508.
Change-Id: Ib9b3569bfebdc7bbfbcb7aee82733b93736c5bb5
Diego Perez [Thu, 7 May 2015 03:14:30 +0000 (03:14 +0000)]
am
0fe14486: am
2021c877: am
33e54563: am
4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '
0fe14486211e3ade7f29ea76e16211853fe9cd7a':
Added function to render a drawable in all available states
Diego Perez [Thu, 7 May 2015 03:02:34 +0000 (03:02 +0000)]
am
2021c877: am
33e54563: am
4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '
2021c8773150dd47d8781375af94143cb22afd9d':
Added function to render a drawable in all available states
Jeff Brown [Thu, 7 May 2015 02:55:32 +0000 (02:55 +0000)]
Merge "Remove incomplete media router API." into mnc-dev
Jeff Brown [Wed, 20 Aug 2014 00:39:42 +0000 (17:39 -0700)]
Remove incomplete media router API.
Bug:
20641986
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
Diego Perez [Thu, 7 May 2015 02:49:50 +0000 (02:49 +0000)]
am
33e54563: am
4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '
33e54563daa0db610f9dc8b9d4fca8f826ffec73':
Added function to render a drawable in all available states
Diego Perez [Thu, 7 May 2015 02:37:28 +0000 (02:37 +0000)]
am
4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '
4b12583653561f69a5780126485380cac187c478':
Added function to render a drawable in all available states
Diego Perez [Thu, 7 May 2015 02:28:50 +0000 (02:28 +0000)]
Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
Bart Sears [Thu, 7 May 2015 01:52:07 +0000 (01:52 +0000)]
Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
Bart Sears [Thu, 7 May 2015 01:51:28 +0000 (01:51 +0000)]
Revert "Always show auxiliary subtypes from NavBar keyboard icon."
CL is breaking the build. Discussed with Seigo and verting until he can take a look at it.
This reverts commit
80ff4ed6bb8dbdad7192d679a01096aa888e090b.
Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
Jeff Brown [Thu, 7 May 2015 01:31:23 +0000 (01:31 +0000)]
Merge changes from topic 'mr' into mnc-dev
* changes:
Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Revert "Initial draft of new MediaRouter APIs."
Andrew Shulaev [Thu, 5 Mar 2015 11:51:38 +0000 (11:51 +0000)]
Added function to render a drawable in all available states
This reverts commit
01cdf8b135be3bf67b9386dc929109c3db82c730.
Change-Id: I596855047d78c3c718744ad61432fc45e1239634
(cherry picked from commit
1f158819bc7cf58f97e47fabfaf23b2fb838f2eb)
Diego Perez [Thu, 7 May 2015 01:02:41 +0000 (01:02 +0000)]
am
c2ba7391: am
613aef87: am
86bff0bb: am
0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '
c2ba7391704cd4025c890b37148c16bf32b55a93':
Add new parameter to the render method to allow forcing a measure pass.
Avoid caching mImage on the main render loop and use clipping.
Diego Perez [Thu, 7 May 2015 00:49:57 +0000 (00:49 +0000)]
am
9af506fb: am
143eaa81: am
2ea82244: am
263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '
9af506fb5b5f1c7f36fb439c2b120ad2b0cda602':
Make status and navigation bars widgets and usable from layouts
Diego Perez [Thu, 7 May 2015 00:49:51 +0000 (00:49 +0000)]
am
ae4619dd: am
df4c977d: am
24e10c0b: am
19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit '
ae4619dd7f3d48cae2e9b83681849a77a8201142':
Move StatusBar to use statusBarColor theme attribute
Diego Perez [Thu, 7 May 2015 00:49:46 +0000 (00:49 +0000)]
am
52ef7fce: am
ffeb8117: am
9c13c8de: am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
52ef7fce1626868d6be34f4038cd852259ad6a26':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Thu, 7 May 2015 00:49:40 +0000 (00:49 +0000)]
am
a131bfe0: am
3dbd18cd: am
872e9950: am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
a131bfe094c007721d006fc9ca21cfa74f41dfef':
More layoutlib tests.
Diego Perez [Thu, 7 May 2015 00:47:08 +0000 (00:47 +0000)]
am
613aef87: am
86bff0bb: am
0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '
613aef87cf6a5958ff2fd255348f92f8d3de152e':
Add new parameter to the render method to allow forcing a measure pass.
Avoid caching mImage on the main render loop and use clipping.
Deepanshu Gupta [Thu, 7 May 2015 00:45:29 +0000 (17:45 -0700)]
resolved conflicts for merge of
a663e012 to mnc-dev
Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
Diego Perez [Thu, 7 May 2015 00:34:32 +0000 (00:34 +0000)]
am
9efcb308: am
21246bd9: am
8e75e307: am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
9efcb308615c0adaf418d430adabea3d271bcbb4':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Thu, 7 May 2015 00:34:26 +0000 (00:34 +0000)]
am
9c9bcd34: am
cae76a70: am
46241071: am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
9c9bcd3486d9f7557329dea90b3c5fa1bdace91c':
Nullity annotations to some tests.
Deepanshu Gupta [Thu, 7 May 2015 00:34:21 +0000 (00:34 +0000)]
am
b2951490: am
b19325be: am
2e3c41a4: am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
b2951490eabf71e14c8fc5d50397adf869a2a291':
Fix title bar showing when not required.
Deepanshu Gupta [Thu, 7 May 2015 00:34:14 +0000 (00:34 +0000)]
am
88b193d7: am
047a28ec: am
96437fb4: am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
88b193d717bb73cbe555e4e621f7b6efdf49cdaa':
LayoutLib: fix crash when shadow size <=0.
Diego Perez [Thu, 7 May 2015 00:33:51 +0000 (00:33 +0000)]
am
86bff0bb: am
0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '
86bff0bb63f3667f0b450420514c931b1f4d25d2':
Add new parameter to the render method to allow forcing a measure pass.
Avoid caching mImage on the main render loop and use clipping.
Diego Perez [Thu, 7 May 2015 00:21:35 +0000 (00:21 +0000)]
am
143eaa81: am
2ea82244: am
263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '
143eaa81934e47c8acb8338d1a2383eb79b690ef':
Make status and navigation bars widgets and usable from layouts
Diego Perez [Thu, 7 May 2015 00:21:29 +0000 (00:21 +0000)]
am
df4c977d: am
24e10c0b: am
19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit '
df4c977d760ccfcf929c77b100faa5f8f38df158':
Move StatusBar to use statusBarColor theme attribute
Diego Perez [Thu, 7 May 2015 00:21:24 +0000 (00:21 +0000)]
am
ffeb8117: am
9c13c8de: am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
ffeb8117b139f61dd7c92bda6a7d47b83871cb66':
Make sure shaders use a color model compatible with the destination.
Diego Perez [Thu, 7 May 2015 00:21:19 +0000 (00:21 +0000)]
am
0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '
0e20bd8e50724ab264425ba830cdf1beb96f7404':
Add new parameter to the render method to allow forcing a measure pass.
Avoid caching mImage on the main render loop and use clipping.
Deepanshu Gupta [Thu, 7 May 2015 00:21:19 +0000 (00:21 +0000)]
am
3dbd18cd: am
872e9950: am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
3dbd18cdfe6af1a9c36261551ef98d39e849d389':
More layoutlib tests.
Deepanshu Gupta [Thu, 7 May 2015 00:21:14 +0000 (00:21 +0000)]
am
9abe4232: am
7e4c1a92: am
b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '
9abe42324f2252460b003e6fcdb097910e16178a':
RecyclerView in LayoutLib: better XML attrs.
Diego Perez [Thu, 7 May 2015 00:21:09 +0000 (00:21 +0000)]
am
21246bd9: am
8e75e307: am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
21246bd92f54be468496848b659bf47f2522430a':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Thu, 7 May 2015 00:21:03 +0000 (00:21 +0000)]
am
cae76a70: am
46241071: am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
cae76a70bfca9f37a10f34582cddbe0792625f26':
Nullity annotations to some tests.
Deepanshu Gupta [Thu, 7 May 2015 00:20:59 +0000 (00:20 +0000)]
am
b19325be: am
2e3c41a4: am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
b19325be074e466c39e86fd4418726a7c305546c':
Fix title bar showing when not required.
Deepanshu Gupta [Thu, 7 May 2015 00:20:53 +0000 (00:20 +0000)]
am
047a28ec: am
96437fb4: am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
047a28ec506bb40081eef6eaf8434884157709ce':
LayoutLib: fix crash when shadow size <=0.
Diego Perez [Thu, 7 May 2015 00:14:25 +0000 (00:14 +0000)]
Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* changes:
Add new parameter to the render method to allow forcing a measure pass.
Avoid caching mImage on the main render loop and use clipping.
Diego Perez [Thu, 7 May 2015 00:09:11 +0000 (00:09 +0000)]
am
2ea82244: am
263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '
2ea82244f0b4396444ec891ab664f9ac40c0b55b':
Make status and navigation bars widgets and usable from layouts
Diego Perez [Thu, 7 May 2015 00:09:00 +0000 (00:09 +0000)]
am
24e10c0b: am
19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit '
24e10c0bad54bdd3b37f6f7effea8f76b687ce3f':
Move StatusBar to use statusBarColor theme attribute
Diego Perez [Thu, 7 May 2015 00:08:53 +0000 (00:08 +0000)]
am
9c13c8de: am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
9c13c8de8291aac69958a106248d3229ff90609f':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Thu, 7 May 2015 00:08:45 +0000 (00:08 +0000)]
am
872e9950: am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
872e9950a227128d323c24eb369863e16964493a':
More layoutlib tests.
Deepanshu Gupta [Thu, 7 May 2015 00:08:36 +0000 (00:08 +0000)]
am
7e4c1a92: am
b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '
7e4c1a92b8f3ce02df0a1502be45c450308d81b7':
RecyclerView in LayoutLib: better XML attrs.
Diego Perez [Thu, 7 May 2015 00:08:29 +0000 (00:08 +0000)]
am
8e75e307: am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
8e75e307373a03dcbc55ce71be5b50f80e0474db':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Thu, 7 May 2015 00:08:22 +0000 (00:08 +0000)]
am
46241071: am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
4624107185135db9db6bfbfb3d0c3a0951c19ee1':
Nullity annotations to some tests.
Deepanshu Gupta [Thu, 7 May 2015 00:08:01 +0000 (00:08 +0000)]
am
2e3c41a4: am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
2e3c41a4e4fbb811cdafc754708d62cba7c6c1b6':
Fix title bar showing when not required.
Deepanshu Gupta [Thu, 7 May 2015 00:07:54 +0000 (00:07 +0000)]
am
96437fb4: am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
96437fb4b05be2602bb0fa215988be646aec28fc':
LayoutLib: fix crash when shadow size <=0.
Diego Perez [Thu, 7 May 2015 00:02:08 +0000 (00:02 +0000)]
am
263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '
263e6dfa6aa3286b71ef908c8b2f06206e747ab1':
Make status and navigation bars widgets and usable from layouts
Adam Powell [Wed, 6 May 2015 23:55:54 +0000 (23:55 +0000)]
Merge "Move PhoneWindow and friends back into internal package" into mnc-dev
Diego Perez [Wed, 6 May 2015 23:53:45 +0000 (23:53 +0000)]
am
19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit '
19dbe50bb534db6fa46f0df47f589a69212e9458':
Move StatusBar to use statusBarColor theme attribute
Diego Perez [Wed, 6 May 2015 23:53:41 +0000 (23:53 +0000)]
am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
bc47abe4b444d0386d1d939e4a223a976fade565':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Wed, 6 May 2015 23:53:37 +0000 (23:53 +0000)]
am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
1f8e3de40c0aed9fa8b9216ddd3224b7ac94acf1':
More layoutlib tests.
Deepanshu Gupta [Wed, 6 May 2015 23:53:32 +0000 (23:53 +0000)]
am
b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '
b4ca896f05eed9d36ac9971810d102a9139502f9':
RecyclerView in LayoutLib: better XML attrs.
Diego Perez [Wed, 6 May 2015 23:53:27 +0000 (23:53 +0000)]
am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
1bc7fb2dcc954caac78d3fc02eb98ec30658d4d0':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Wed, 6 May 2015 23:53:23 +0000 (23:53 +0000)]
am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
4f8a999682fdb8b38ee5671b8a8f527569ebb5ff':
Nullity annotations to some tests.
Deepanshu Gupta [Wed, 6 May 2015 23:53:18 +0000 (23:53 +0000)]
am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
92e798682b5e45a05bffecb40a9b9f473420ea79':
Fix title bar showing when not required.
Deepanshu Gupta [Wed, 6 May 2015 23:53:14 +0000 (23:53 +0000)]
am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
9aa600e79f8f68115e8e95f02933376e3da7d194':
LayoutLib: fix crash when shadow size <=0.
Diego Perez [Wed, 6 May 2015 23:52:05 +0000 (23:52 +0000)]
Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
Diego Perez [Wed, 6 May 2015 23:45:40 +0000 (23:45 +0000)]
Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
Diego Perez [Wed, 6 May 2015 23:43:49 +0000 (23:43 +0000)]
Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:43:09 +0000 (23:43 +0000)]
Merge "More layoutlib tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:54 +0000 (23:42 +0000)]
Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
Diego Perez [Wed, 6 May 2015 23:42:33 +0000 (23:42 +0000)]
Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:19 +0000 (23:42 +0000)]
Merge "Nullity annotations to some tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:00 +0000 (23:42 +0000)]
Merge "Fix title bar showing when not required." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:41:35 +0000 (23:41 +0000)]
Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
George Mount [Tue, 5 May 2015 23:44:15 +0000 (16:44 -0700)]
Fix crash during Activity Transition with TextureView.
Bug
20675857
GhostView was synchronously forcing the View's parent to get
the display list when it was created. TextureView's cannot
create a display list until a surface is available and will
crash if it is attempted. This change moves the request to
an invalidate to get it to execute at a later time.
Change-Id: I12afebdfd57eb29c1a35b23a63d045e319547faf
Seigo Nonaka [Wed, 6 May 2015 23:08:03 +0000 (23:08 +0000)]
Merge "Do nothing if hideSoftInput is called from not focused client." into mnc-dev
Jeff Brown [Tue, 5 May 2015 20:52:23 +0000 (13:52 -0700)]
Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Bug:
20641986
Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
Jeff Brown [Tue, 5 May 2015 20:46:30 +0000 (13:46 -0700)]
Revert "Initial draft of new MediaRouter APIs."
This reverts commit
1a937b04e63539cb1fab1bde601031d415c7156f.
Bug:
20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
Seigo Nonaka [Wed, 6 May 2015 17:31:47 +0000 (10:31 -0700)]
Do nothing if hideSoftInput is called from not focused client.
IMMS#hideSoftInput calls IMMS#setImeWindowVisibilityStatusHiddenLocked
if it is called from not focused client. However this function changes
IMS visibility state and also changes the back key indicator wrongly.
IMMS should just ignore IMMS#hideSoftInput from not-focused client.
As a preparation to fix b/
20764441, this CL partially reverts
Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0 but shouldn't have any
user-visible UX regressions.
Bug:
20764441
Change-Id: I60963f1474457ff37cca85e262460dca8105acff
Adam Powell [Wed, 6 May 2015 22:57:09 +0000 (15:57 -0700)]
Move PhoneWindow and friends back into internal package
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.
Bug
19606548
Change-Id: Id07b791d178fa447010b49b24726b52208838e88
John Spurlock [Wed, 6 May 2015 22:49:03 +0000 (22:49 +0000)]
Merge "Add setting to mute wireless charging sound." into mnc-dev
John Reck [Wed, 6 May 2015 21:55:05 +0000 (14:55 -0700)]
Add warning if an in-use Bitmap is reconfigured
Bug:
18928352
Also fix an issue around re-configure not properly handling
mPinnedCount in android::Bitmap
Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
Yorke Lee [Wed, 6 May 2015 22:29:18 +0000 (22:29 +0000)]
Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev
John Spurlock [Wed, 6 May 2015 21:41:30 +0000 (17:41 -0400)]
Add setting to mute wireless charging sound.
Bug:
19538553
Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725
Nicolas Prevot [Wed, 6 May 2015 22:18:35 +0000 (22:18 +0000)]
Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev
John Reck [Wed, 6 May 2015 22:09:59 +0000 (22:09 +0000)]
Merge "Annotate Application with @CallSuper" into mnc-dev
Jinsuk Kim [Wed, 6 May 2015 22:07:21 +0000 (22:07 +0000)]
Merge "CEC: Reset active source/path before going into standby" into mnc-dev
Matthew Williams [Wed, 6 May 2015 21:46:21 +0000 (21:46 +0000)]
Merge "Delay all syncing until the device is provisioned" into mnc-dev
Raph Levien [Wed, 6 May 2015 21:35:11 +0000 (21:35 +0000)]
Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev
Raph Levien [Wed, 6 May 2015 21:26:35 +0000 (14:26 -0700)]
Clear all StaticLayout.Builder fields on pool recycle
When returning a StaticLayout.Builder object to the pool, it is
important to clear everything out. If not, then the object may have
stale state from a previous layout operation. This was causing CTS
test failures and probably other mischief.
Bug:
20636917
Change-Id: I76fb20076ee954fcb476131a8fbe8833d72fbc0d
John Spurlock [Wed, 6 May 2015 21:20:30 +0000 (21:20 +0000)]
Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev
John Spurlock [Wed, 6 May 2015 21:20:10 +0000 (21:20 +0000)]
Merge "Volume a11y: Rename introduction 'confirm' button to 'close'." into mnc-dev
Tim Murray [Wed, 6 May 2015 21:19:43 +0000 (21:19 +0000)]
Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev