Commit Graph

43375 Commits

Author SHA1 Message Date
George Mount
ddc5bd84b6 am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev
* commit '10e15c3ad6d5395c38c73b72aff4267eed0a66b8':
  Make Fragment Transitions match Acitivty Transitions API
2014-09-03 17:05:03 +00:00
Christoph Studer
717ad1da29 am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev
* commit '342ece751b683d4532e273f196f4f99dfc569067':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
2014-09-03 17:04:38 +00:00
Sander Alewijnse
66b4040c05 am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev
* commit '727738ada473ae5e905a1c3c38f136b2669f6b5e':
  Add the provisioning extra admin extras bundle.
2014-09-03 17:04:33 +00:00
Yohei Yukawa
b2745fabdd am ebb6b422: Merge "API Review: InputConnection" into lmp-dev
* commit 'ebb6b4224ee02b2ef7ae5d58c9e7cdf3ab16b090':
  API Review: InputConnection
2014-09-03 17:04:21 +00:00
Lorenzo Colitti
1548796fbf am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev
* commit '1ae4e750dd822edda13ee68c827f977b6e533fc5':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
2014-09-03 17:04:11 +00:00
Svetoslav
ac92df0a05 am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev
* commit '551335a38d0214e739571193369d6e476d9ff75b':
  Fix AccessibilityNode's isVisibleToUser behavior.
2014-09-03 16:43:31 +00:00
Alan Viverette
e368dc6208 am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev
* commit 'b975fe8793329ad3543b4d2462bf42db524ed161':
  Fix accessibility events emitted from TwoStatePreference
2014-09-03 16:42:02 +00:00
Adam Powell
6319a2f12e am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev
* commit '1b17f9390020b2801c9b4bea0a5ada5fe7bc37df':
  Automatically supply a content description for ToolbarActionBar nav
2014-09-03 16:41:52 +00:00
Yohei Yukawa
73c9bddee1 am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev
* commit '667b31d200c5a919909a7c8d677033607d7d33cb':
  API Review: CursorAnchorInfo
2014-09-03 16:41:44 +00:00
Lorenzo Colitti
154b83c008 am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev
* commit '910113a91cc62b5840f107f9b41e4a6445d2a155':
  Use per-Network connection pools for openConnection.
2014-09-03 16:41:08 +00:00
Lorenzo Colitti
bc940e69f1 am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
* commit '2c0a5509a7d74c013e63b7056679394811b5e984':
  Pass the socket mark for DNS queries to dnsmasq.
2014-09-03 16:41:03 +00:00
Alan Viverette
b698a79db4 am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev
* commit '489e207dcd42e1d4e4c78d7b72138f4a094dfd79':
  Update pointer hotspots to scale for DPI
2014-09-03 16:40:39 +00:00
Dianne Hackborn
91d6981795 am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev
* commit '8070053f6266c98bcffca335b4642d415638b05c':
  Add public constant for usage stats app op.
2014-09-03 16:40:17 +00:00
Raph Levien
0ee15df481 am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev
* commit '2e97ac0cccdb8625385dc2373ce1a0d8e5f18b2c':
  Ensure layout in getExtendedPadding calls
2014-09-03 16:40:13 +00:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Christoph Studer
1097b15569 Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 2014-09-03 12:28:29 +00:00
Sander Alewijnse
52c0f04cbc Merge "Add the provisioning extra admin extras bundle." into lmp-dev 2014-09-03 11:43:42 +00:00
Sander Alewijnse
90f14bf53e Add the provisioning extra admin extras bundle.
Enables the MDM app running (as a regular app) in the primary user to pass
through a bundle of data with which to bootstrap the instance of itself
running as profile owner in the managed profile.

Bug:17126717
Change-Id: I28a368d13e33990b16dcd68436902e0a077d5f5d
2014-09-03 12:26:08 +01:00
Yohei Yukawa
851377f90c Merge "API Review: InputConnection" into lmp-dev 2014-09-03 09:41:48 +00:00
Lorenzo Colitti
e21b564168 Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev 2014-09-03 06:27:12 +00:00
Yohei Yukawa
d8636ea7ca API Review: InputConnection
This CL does nothing but rename some L API candidates
in InputConnection class, as per requested.

- requestUpdateCursorAnchorInfo()
  -> requestCursorUpdates()
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_IMMEDIATE
  -> CURSOR_UPDATE_IMMEDIATE
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR
  -> CURSOR_UPDATE_MONITOR

BUG: 17320996
Change-Id: I772c48ff18918e48a81e807b48ff907614485c09
2014-09-02 22:39:08 -07:00
Svetoslav
f0e57e10ed Merge "Fix AccessibilityNode's isVisibleToUser behavior." into lmp-dev 2014-09-03 03:14:12 +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
Svetoslav
9ae9ed24aa Fix AccessibilityNode's isVisibleToUser behavior.
The isVisibleToUser property of an AccessibilityNodeInfo specifies
whether the user can see the source view. It is used by accessibility
services to figure out whether to focus on a view. This property
was giving a wrong value if the view is covered by another window
such as the keyboard. As a result the user hears one thing but when
double taps interacts with the overlaid window which is another thing.

bug:15938254

Change-Id: Ib9feb20ea422a24a512c47ed1234961ae0386a7f
2014-09-02 16:46:23 -07: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
George Mount
c03da0e7a9 Make Fragment Transitions match Acitivty Transitions API
Bug 17188255

Change-Id: I506a097be4010d7156caf465c95295c58612c16e
2014-09-02 15:15:12 -07: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
a85bf4722d am 4fdbcb33: Add constants so we can distinguish decryption failures
* commit '4fdbcb3312a85bfe1256144b27b58908aaf73a13':
  Add constants so we can distinguish decryption failures
2014-09-02 18:45:29 +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
7545741b36 am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev
* commit 'b1ff74c91cf947246aa0f874030b82bff70e81fd':
  VirtualDisplay.Callbacks -> Callback
2014-09-02 18:02:35 +00:00
Jean-Michel Trivi
1b5ea2cf9d am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev
* commit 'cd46ad9833c8ed07d8a33e3925f7978d7d5c88a0':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
2014-09-02 18:02:31 +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
Tyler Gunn
bd4ca2b4b4 am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev
* commit '78c0d4ab75c61efc48af1a698fd7d36620523866':
  Remove "ask each time" SIP call setting. (1/2)
2014-09-02 17:42:11 +00:00
Dianne Hackborn
8bce896373 am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev
* commit '4b9a934cef4de4985c0e316ef89ca41b3e720135':
  Hide the interaction part of VoiceInteractionService.
2014-09-02 17:42:08 +00:00
Tyler Gunn
4b7498d81f Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 2014-09-02 17:31:39 +00:00
Ronghua Wu
4f932886aa am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev
* commit 'e4999af808ac0e48932e3ac843df9bb9e6a45c46':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
2014-09-02 17:31:11 +00:00
Amith Yamasani
f1541722e4 am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev
* commit '9bdf3963a64d8eb0b66705da3922c464badaa539':
  Make it possible to remove current user
2014-09-02 17:31:04 +00:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00