Alan Viverette
7b9b90e9f5
am f1db0fca: am 0fd03d91: am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev
...
* commit 'f1db0fcaafb7faf5437415e35bbc3c74bd626684':
Fix accessibility events emitted from TwoStatePreference
2014-09-03 13:49:31 +00:00
Adam Powell
b1e7fab278
am 0e55581c: am 9f7a5fae: am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev
...
* commit '0e55581c1bb7f707653e2df99fe1336331e12a6e':
Automatically supply a content description for ToolbarActionBar nav
2014-09-03 13:49:16 +00:00
Yohei Yukawa
a86977f12a
am 6a1a0ada: am 449ee1aa: am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev
...
* commit '6a1a0ada78bd31cfa5e9632d955501ab8bc28a38':
API Review: CursorAnchorInfo
2014-09-03 13:49:05 +00:00
Lorenzo Colitti
868ec4fdb8
am 91c22552: am a04d244b: am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev
...
* commit '91c22552e8541ae17429d097ca79b83b94e4d6e7':
Use per-Network connection pools for openConnection.
2014-09-03 09:13:49 +00:00
Lorenzo Colitti
14f084c1d9
am a4695da9: am 4c172753: am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
...
* commit 'a4695da9035d17a9d7f58b8eaaac1b4d8f8020d3':
Pass the socket mark for DNS queries to dnsmasq.
2014-09-03 09:13:43 +00:00
Alan Viverette
873a2dde58
am 3b955779: am 69a2f2b6: am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev
...
* commit '3b9557795420c3ddae9fd4cf172c7f05313e1d6a':
Update pointer hotspots to scale for DPI
2014-09-03 09:13:34 +00:00
Dianne Hackborn
07297cd527
am 2d55b767: am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev
...
* commit '2d55b7674690fa566f927b33f7309dd68645b20a':
Add public constant for usage stats app op.
2014-09-03 09:13:29 +00:00
Raph Levien
adecb3f832
am 67d8925f: am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev
...
* commit '67d8925ff3e866e35f7bb5345355100ec6b70300':
Ensure layout in getExtendedPadding calls
2014-09-03 09:13:24 +00:00
Alan Viverette
9cca0b4a12
am 0fd03d91: am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev
...
* commit '0fd03d91fe4ca61ce62844d59f8c3a3481a1b627':
Fix accessibility events emitted from TwoStatePreference
2014-09-03 06:13:24 +00:00
Adam Powell
0c0702da64
am 9f7a5fae: am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev
...
* commit '9f7a5fae89057644244f0821f75954100ff6deaa':
Automatically supply a content description for ToolbarActionBar nav
2014-09-03 06:13:06 +00:00
Yohei Yukawa
ce8244ac71
am 449ee1aa: am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev
...
* commit '449ee1aa7aad49def82bff3c09754a0ad8bc3e2a':
API Review: CursorAnchorInfo
2014-09-03 06:12:56 +00:00
Lorenzo Colitti
b448f7a6ef
am a04d244b: am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev
...
* commit 'a04d244bf06dbd5845e5129275c30f631b1d0013':
Use per-Network connection pools for openConnection.
2014-09-03 05:49:27 +00:00
Lorenzo Colitti
e7cd2f5515
am 4c172753: am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
...
* commit '4c172753f892557175ecb4c3cf4ed6fd76227049':
Pass the socket mark for DNS queries to dnsmasq.
2014-09-03 05:49:22 +00:00
Alan Viverette
1834ecdef4
am 69a2f2b6: am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev
...
* commit '69a2f2b6059dc87cbee142d1f710d92521ef4389':
Update pointer hotspots to scale for DPI
2014-09-03 05:49:05 +00:00
Dianne Hackborn
c7535364b6
am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev
...
* commit '1f9c4f452d976ad54538ef4ff6484d354ba18212':
Add public constant for usage stats app op.
2014-09-03 05:48:53 +00:00
Raph Levien
82ea4ee7f4
am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev
...
* commit '83f28d5710b9ffca5ab8876e12458a515e694645':
Ensure layout in getExtendedPadding calls
2014-09-03 05:48:48 +00:00
Alan Viverette
f6f7b0c569
Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev
2014-09-03 00:38:59 +00:00
Adam Powell
d400ca2f8d
Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev
2014-09-03 00:11:00 +00:00
Yohei Yukawa
d780ce1920
Merge "API Review: CursorAnchorInfo" into lmp-dev
2014-09-02 23:45:36 +00:00
Alan Viverette
996a63859f
Fix accessibility events emitted from TwoStatePreference
...
Removes redundant and conflicting events emitted from check and switch
preferences. Sends VIEW_CLICKED accessibility events from AdapterView
rows after calling their on click listeners, which ensures data is
consistent.
BUG: 16961152
Change-Id: I4b57bceec6830d775c2da57226b8ee482242caf7
2014-09-02 16:35:45 -07:00
Adam Powell
12b0321c0b
Automatically supply a content description for ToolbarActionBar nav
...
If the developer hasn't set a navigation content description on the
Toolbar assigned to be an action bar or a home-action content
description via the ActionBar interface, use the framework default
"navigate up" string.
Also make sure that the default Up description is supplied in the
screen_toolbar window decor layout and that it is parsed properly in
all toolbars, even if we don't have an icon set during construction.
Bug 17298370
Change-Id: Ie2f9e34f92046d4d4ffb9a07e38fa89581891f7b
2014-09-02 16:20:08 -07:00
Lorenzo Colitti
ca2f20deaa
Merge "Use per-Network connection pools for openConnection." into lmp-dev
2014-09-02 22:40:10 +00:00
Lorenzo Colitti
089ea995ba
Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
2014-09-02 22:39:18 +00:00
Alan Viverette
d379361ecb
Merge "Update pointer hotspots to scale for DPI" into lmp-dev
2014-09-02 22:20:12 +00:00
Dianne Hackborn
7b7b754fab
Merge "Add public constant for usage stats app op." into lmp-dev
2014-09-02 21:54:56 +00:00
Raph Levien
4c5ea10caf
Merge "Ensure layout in getExtendedPadding calls" into lmp-dev
2014-09-02 21:53:26 +00:00
Raph Levien
463cf1aea8
Ensure layout in getExtendedPadding calls
...
There are cases in which getExtendedPaddingTop() and Bottom can get
called even without a valid layout. This patch just makes sure there
is some reasonable layout available.
Fix for bug 14819392 "java.lang.NullPointerException in
android.widget.TextView"
Change-Id: I203899402ddfe857a688b16b7855a8991eee82b7
2014-09-02 14:23:18 -07:00
Yohei Yukawa
cc24e2b6a2
API Review: CursorAnchorInfo
...
This CL introduces following combinable flags as a replacement
of CHARACTER_RECT_TYPE_* constants.
- CursorAnchorInfo.FLAG_HAS_VISIBLE_REGION
- CursorAnchorInfo.FLAG_HAS_INVISIBLE_REGION
This CL also replaces #isInsertionMarkerClipped() with
flags.
Rationale:
getCharacterRectFlags() should return a set of flags, rather
than enum-like types.
getInsertionMarkerFlags() is more consistent with
getCharacterRectFlags() than isInsertionMarkerClipped().
It is also open for future extension.
BUG: 17200900
Change-Id: Ia8cbb9f6b41cd9509fc0147fd68763dfde593ffc
2014-09-02 14:08:39 -07:00
Paul Lawrence
28bebdc2a2
am cf2895ec: am 60a85de8: am 4fdbcb33: Add constants so we can distinguish decryption failures
...
* commit 'cf2895ece9b80c36fe7d279777ea4a869f9bf2df':
Add constants so we can distinguish decryption failures
2014-09-02 19:14:23 +00:00
Paul Lawrence
39d8aab585
am 60a85de8: am 4fdbcb33: Add constants so we can distinguish decryption failures
...
* commit '60a85de8b99de43df5ea3de36d45831e2bdffe49':
Add constants so we can distinguish decryption failures
2014-09-02 18:55:52 +00:00
Michael Wright
2993c30a33
am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
...
* commit 'ac0f5a4616dab78a4216d826219379a663cc1139':
VirtualDisplay.Callbacks -> Callback
2014-09-02 18:36:06 +00:00
Jean-Michel Trivi
b129930398
am dbb72302: am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev
...
* commit 'dbb723022367174662a49aa4080286d454e2e0e4':
Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
2014-09-02 18:36:01 +00:00
Paul Lawrence
e2c88d39b2
Add constants so we can distinguish decryption failures
...
Bug: 17213613
Change-Id: I6bc10a1ed0855f6946ea9eb2f8d2db00c1af327c
2014-09-02 18:26:32 +00:00
Michael Wright
01fd39a09d
am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
...
* commit '6e0bd93a2b7fc338c3ba64995cba309cd51035b6':
VirtualDisplay.Callbacks -> Callback
2014-09-02 18:21:50 +00:00
Jean-Michel Trivi
8adc5b68ad
am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev
...
* commit '26f51de01c45e86c340efd783ea577719850be4a':
Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
2014-09-02 18:21:45 +00:00
Tyler Gunn
392f24dc8d
am 51023e0e: am a8c7d1bc: am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
...
* commit '51023e0e394d33773a4dd4650190fd1b41131303':
Remove "ask each time" SIP call setting. (1/2)
2014-09-02 18:12:29 +00:00
Dianne Hackborn
43f75b4db1
am 347a8167: am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
...
* commit '347a81674350d3848e513f678cbf689074b935fd':
Hide the interaction part of VoiceInteractionService.
2014-09-02 18:12:20 +00:00
Ronghua Wu
98f883f8de
am 50ac3f3c: am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
...
* commit '50ac3f3c994e9a825f6f84445ce44ce8b4451c20':
API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
2014-09-02 18:02:52 +00:00
Amith Yamasani
06ee49b935
am 4f7681af: am e681727f: am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev
...
* commit '4f7681afaf074096510261fa9f29ca9757d0605d':
Make it possible to remove current user
2014-09-02 18:02:42 +00:00
Tyler Gunn
c855fa5991
am a8c7d1bc: am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
...
* commit 'a8c7d1bcf5de323a8a5b8e3fff0c7759be06118e':
Remove "ask each time" SIP call setting. (1/2)
2014-09-02 18:00:00 +00:00
Dianne Hackborn
86f0c17e4b
am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
...
* commit '4e784a505cb76e00e88dcf00c7b41b6ff0417964':
Hide the interaction part of VoiceInteractionService.
2014-09-02 17:59:55 +00:00
Dianne Hackborn
5064e7c70c
Add public constant for usage stats app op.
...
Change-Id: Ibc031b50e9fa4f1bd0955e0afd98e8b1bd77b905
2014-09-02 10:57:16 -07:00
Michael Wright
02aa75a083
Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
2014-09-02 17:54:45 +00:00
Jean-Michel Trivi
5f4cfd3ab7
Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev
2014-09-02 17:52:46 +00:00
Alan Viverette
376d10e99e
Update pointer hotspots to scale for DPI
...
Also updates the bitmap resources, which weren't scaled correctly
for their respective DPI buckets.
BUG: 16459309
Change-Id: Iedc781e2ee47a8b960390fea718cb08bcfb84ae3
2014-09-02 10:45:30 -07:00
George Mount
a46457597a
am e4ff5cd7: am 8e95e5f7: am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev
...
* commit 'e4ff5cd75e38f8e76ea2a1b9a77e492df0a7c865':
Update window always on convertTo/FromTranslucent
2014-09-02 17:45:17 +00:00
Ronghua Wu
ea34edbee6
am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
...
* commit 'eaa9befb1e981d58a8e4d248c88d4fe204d06ea9':
API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
2014-09-02 17:43:10 +00:00
Amith Yamasani
4f34c86f3c
am e681727f: am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev
...
* commit 'e681727f0106b67824e6315e5473232b42f54120':
Make it possible to remove current user
2014-09-02 17:42:54 +00:00
Christoph Studer
5da33dd794
am 496e72ca: am b95181ac: am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev
...
* commit '496e72cac5103edd1ccd56a95741ec664fe9cae3':
Notification: Reset view params for re-use
2014-09-02 17:39:24 +00:00
Jorim Jaggi
db1600aeec
am c2ce51ee: am db68bb49: am faecb0b4: Merge "Media notification updates" into lmp-dev
...
* commit 'c2ce51eea33d81728420724bb6bd7bdd0f85c63a':
Media notification updates
2014-09-02 17:38:53 +00:00