Fabrice Di Meglio
46e62fe398
am 024e70c8: am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
...
* commit '024e70c8156a0fa2d702ff2fba4a38c1f6b68f98':
Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 17:13:23 -07:00
Fabrice Di Meglio
024e70c815
am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
...
* commit 'dd80335edde688794db3260bcea7f732430abaf1':
Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 14:22:04 -07:00
Fabrice Di Meglio
dd80335edd
am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
...
* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 13:55:46 -07:00
Justin Koh
b5b183d574
am e8d85f6d: am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
...
* commit 'e8d85f6d1f1ee957302b113f06a0b2f1aa9024fe':
Expose PreferenceManager constructor / Preference#performClick
2012-10-29 13:43:19 -07:00
Jeff Brown
266ca72300
am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit '46a0ec73b6d4a81dd037d7beef7321f25349bf9c':
Add MediaRouter API to get presentation display.
2012-10-29 13:43:14 -07:00
Michael Jurka
e3e8928ff9
am 56dfba03: am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
...
* commit '56dfba037cbfec51df16e324dd4b0daa8b540746':
Adding ability to add multiple widgets to keyguard
2012-10-29 13:40:31 -07:00
Justin Koh
e8d85f6d1f
am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
...
* commit '56d9696bb717ab0c7deebf4c84b0ff2094bd6cff':
Expose PreferenceManager constructor / Preference#performClick
2012-10-29 13:37:17 -07:00
Jeff Brown
46a0ec73b6
am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
Add MediaRouter API to get presentation display.
2012-10-29 13:37:10 -07:00
Michael Jurka
56dfba037c
am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
...
* commit 'e88eebbb3ba8999cd81e79dc62a8dd14c64b592d':
Adding ability to add multiple widgets to keyguard
2012-10-29 13:35:20 -07:00
Justin Koh
56d9696bb7
Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
2012-10-29 13:33:01 -07:00
Jeff Brown
14012e1d1b
am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
...
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
Add MediaRouter API to get presentation display.
2012-10-29 13:32:02 -07:00
Michael Jurka
e88eebbb3b
am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
...
* commit '147dfc8642ecbdce527d18bdbeece7b7d05dc883':
Adding ability to add multiple widgets to keyguard
2012-10-29 13:30:16 -07:00
Fabrice Di Meglio
07ce0ca265
Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
2012-10-26 15:18:30 -07:00
Jeff Brown
4e0bf7c486
Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
2012-10-26 13:52:03 -07:00
Fabrice Di Meglio
1957d281ea
Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
...
- check layout direction previous value in the onResolveDrawables(int) callback
- dont do any Drawables resolution if we cannot resolve the layout direction
- also remove unnecessary call to resolveRtlPropertiesIfNeeded() in ViewGroup when
adding a child as the call to resolveRtlPropertiesIfNeeded() will be done into
the measure() call itself later
Change-Id: I62237af3d307dfea203f7f2865551d1c61a0e0b8
2012-10-26 10:55:02 -07:00
Tadashi G. Takaoka
cb95cd6bae
Fix downTime of InputMethodService.sendDownUpKeyEvents method
...
Bug: 7403935
Change-Id: I9074269c9a5f5b54b632da11151ad46c3494dc19
2012-10-26 17:20:59 +09:00
Jeff Brown
92130f6407
Add MediaRouter API to get presentation display.
...
This new API makes it possible for an application to ask on
which Display it should show a Presentation based on the currently
selected media route.
Also added a new API on DisplayManager to query displays that
support a certain category of uses.
Improved the documentation of the Presentation class to explain
how to choose an appropriate Display for presentation.
Bug: 7409073
Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
2012-10-25 20:31:21 -07:00
Justin Koh
37ae558676
Expose PreferenceManager constructor / Preference#performClick
...
Expose PreferenceManager constructor and Preference#performClick so they can be
used by other UIs beyond the standard PreferenceActivity. Marked @hide so public
API is not affected.
Change-Id: Ieb4aecba5f86e40ff70f2b252458602e6b9ad1ee
2012-10-25 16:27:43 -07:00
Fabrice Di Meglio
809312791c
am 0182dc39: am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '0182dc39bd969b797614c90e44978b83ac57fd1c':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:50:07 -07:00
Fabrice Di Meglio
0182dc39bd
am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '3b53061e6d2753440da04c042d26b8c4e94a5b95':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:47:08 -07:00
Fabrice Di Meglio
654761a059
am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:45:06 -07:00
Fabrice Di Meglio
3b53061e6d
am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:44:47 -07:00
Fabrice Di Meglio
3e297339f8
Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
2012-10-25 11:41:20 -07:00
Fabrice Di Meglio
72898e9828
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
...
- made them private and final
- fixed comment
Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
2012-10-25 11:22:39 -07:00
Michael Jurka
147dfc8642
Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
2012-10-24 18:28:21 -07:00
Dianne Hackborn
7a588e757a
am a699c1b1: am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647 : Add getUserCount() API" into jb-mr1-dev
...
* commit 'a699c1b16f9732308a5c17260607db1b7690d394':
Fix issue #7408647 : Add getUserCount() API
2012-10-24 18:07:17 -07:00
Dianne Hackborn
a699c1b16f
am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647 : Add getUserCount() API" into jb-mr1-dev
...
* commit '72d0a5aa04f18af5037ff331c2f0983f7cbd4331':
Fix issue #7408647 : Add getUserCount() API
2012-10-24 18:04:27 -07:00
Dianne Hackborn
72d0a5aa04
am ead7d90e: Merge "Fix issue #7408647 : Add getUserCount() API" into jb-mr1-dev
...
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
Fix issue #7408647 : Add getUserCount() API
2012-10-24 18:02:05 -07:00
Dianne Hackborn
ead7d90e8b
Merge "Fix issue #7408647 : Add getUserCount() API" into jb-mr1-dev
2012-10-24 17:58:13 -07:00
Michael Jurka
aa2859ae61
Adding ability to add multiple widgets to keyguard
...
Bug: 7381803
2012-10-24 17:41:34 -07:00
Nick Kralevich
52cfb0ccc7
am 369852eb: am 7e007ff8: Merge "Sensors could be disabled by any application"
...
* commit '369852ebdea6a5843e299000c57baac89282b154':
Sensors could be disabled by any application
2012-10-24 16:52:21 -07:00
Nick Kralevich
369852ebde
am 7e007ff8: Merge "Sensors could be disabled by any application"
...
* commit '7e007ff83738a83f43cb59ddc023a2b860367074':
Sensors could be disabled by any application
2012-10-24 16:50:32 -07:00
Nick Kralevich
7e007ff837
Merge "Sensors could be disabled by any application"
2012-10-24 16:29:06 -07:00
Bo Liu
7cd2baf4ce
Remove CacheManager implementation
...
CacheManager will not be implemented with webviewchromium. So removing
existing implemntation in WebViewClassic.
Change-Id: I82d3a156ba898393cc12080f8150841cd76f187a
2012-10-24 16:00:01 -07:00
Dianne Hackborn
b26306ad52
Fix issue #7408647 : Add getUserCount() API
...
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
2012-10-24 15:28:03 -07:00
Romain Guy
144b59adb1
am f323fd07: am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit 'f323fd07ba75b8bc13470a22f698937345bc9f0d':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:58:49 -07:00
Romain Guy
f323fd07ba
am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit '4344f20959b6591f484d20012a398d7fefe8a8fb':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:56:27 -07:00
Romain Guy
4344f20959
am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:53:46 -07:00
Romain Guy
9933331506
Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
2012-10-24 13:50:45 -07:00
Jeff Brown
2af7e72229
am 5bac2df4: am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '5bac2df4d69f096fa8c858bcb3713b7af9e977f8':
Secure windows, secure surface views and secure displays.
2012-10-24 12:22:01 -07:00
Jeff Brown
5bac2df4d6
am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit 'b43269acddb7061c43fa6ace6a896c51a9bf4dce':
Secure windows, secure surface views and secure displays.
2012-10-24 12:19:59 -07:00
Jeff Brown
b43269acdd
am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
Secure windows, secure surface views and secure displays.
2012-10-24 12:17:16 -07:00
Jeff Brown
1202c43685
Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
2012-10-24 12:14:08 -07:00
Zhihai Xu
99fc7d9c94
am 843031b0: am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit '843031b03eaa062a59f467bd3e00f88d5f87adba':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:52:10 -07:00
Zhihai Xu
843031b03e
am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit 'a656971e73a09c8aa01f8a2922865ea00df43758':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:50:16 -07:00
Zhihai Xu
a656971e73
am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit '8e080d7e10dd17662750605538a9799af66494e9':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:48:01 -07:00
Zhihai Xu
8e080d7e10
Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
2012-10-24 10:44:16 -07:00
Torne (Richard Coles)
a9bbd9439c
Rename Chromium-powered WebView package.
...
The Chromium-powered WebView package has been renamed from
com.android.webviewchromium to com.android.webview.chromium. Reflect
this renaming in the factory.
Change-Id: I64ba2b54c52aad8f10eef68d12366ce9be09b9c8
2012-10-24 11:59:22 +01:00
Jeff Brown
f0681b34df
Secure windows, secure surface views and secure displays.
...
Add new API to determine whether a display is secure.
Add new API to make a SurfaceView secure.
Clarify documentation.
Bug: 7368436
Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
2012-10-23 20:37:40 -07:00
Romain Guy
bd17bd3431
Ensure we have a GL context before deleting View layers
...
Bug #7391098
The existing code was doing a make current to guarantee we have a
current context. This can however fail when the surface is destroyed
which could lead to GL calls without an EGL context, and therefore
potential leaks. This change fixes the issue by using a technique
found in HardwareRenderer.destroyHardwareResources(). If the surface
is not available then we use a special 1x1 pbuffer as a way to get
a valid context.
Change-Id: I716d3799bf90120d793d76e90a83956837ecd491
2012-10-23 19:17:15 -07:00