Pablo Ceballos
38f18683b2
Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev
...
am: 6266d8c
2016-03-23 16:42:12 +00:00
Chris Banes
d4534a3d9d
Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev
...
am: a62a0f7
2016-03-23 16:34:51 +00:00
Pablo Ceballos
6266d8c959
Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev
2016-03-23 16:30:54 +00:00
Chris Banes
a62a0f7286
Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev
2016-03-23 16:25:53 +00:00
Chris Banes
ccf8e661c7
Allow AlertDialog to be used in a DialogFragment
...
AlertController calls requestWindowFeature() too
later for DialogFragment. Fixed by moving it to the
constructor.
BUG: 27809055
Change-Id: Icef01316b4e857b41ccc29cc56bbcecd7f629342
2016-03-23 16:20:00 +00:00
Abodunrinwa Toki
f99cbc8735
Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev
...
am: ae64758
* commit 'ae64758eddecec9cb90b6c540fa4687c7f2b2078':
Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
2016-03-23 16:11:05 +00:00
Abodunrinwa Toki
ae64758edd
Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev
2016-03-23 16:02:36 +00:00
Chet Haase
bdfe23202d
Merge "Clarify docs around weak references to animator targets" into nyc-dev
...
am: 5084bd6
2016-03-23 12:54:42 +00:00
Chet Haase
5084bd66dd
Merge "Clarify docs around weak references to animator targets" into nyc-dev
2016-03-23 12:46:30 +00:00
Yohei Yukawa
06963ca369
Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev
...
am: c1a72b6
2016-03-23 05:51:14 +00:00
Yohei Yukawa
c1a72b6b74
Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev
2016-03-23 05:41:08 +00:00
Yohei Yukawa
afb6558c8f
Remove redundant IMM#mServedInputConnection.
...
Following two fields have basically the same lifetime.
- InputMethodManager#mServedInputConnection
- InputMethodManager#mServedInputConnectionWrapper
Hence we do not need to maintain both of them.
This is a preparation CL for Bug 25332806 and does not change any
user-visible behavior.
Bug: 25332806
Change-Id: I1181e067aa5bedbdf0c7ec1bcec479257aea511c
2016-03-22 20:53:08 -07:00
Pierre Imai
87044260be
Merge "Improve NetworkCapabilities command chaining." into nyc-dev
...
am: 82a3637
2016-03-23 01:18:47 +00:00
Pierre Imai
82a3637fce
Merge "Improve NetworkCapabilities command chaining." into nyc-dev
2016-03-23 01:11:15 +00:00
Chet Haase
e60a693d84
Clarify docs around weak references to animator targets
...
Issue #26069047 Weak reference to the target in animators
can cause interrupted animations
Change-Id: I719f619006e93a94af907c4de7840c691a5aed37
2016-03-22 16:20:46 -07:00
Paul Stewart
366f851e35
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
...
am: 68ffbba
2016-03-22 22:27:38 +00:00
Paul Stewart
68ffbba158
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
...
* changes:
WifiManager: Use ConnectivityThread
Create ConnectivityThread
2016-03-22 22:23:48 +00:00
Alex Klyubin
481d0f9a8b
Merge "Unbreak verifying v2 signatures of large APKs." into nyc-dev
...
am: 238ec1f
2016-03-22 19:42:52 +00:00
Alex Klyubin
238ec1f7c7
Merge "Unbreak verifying v2 signatures of large APKs." into nyc-dev
2016-03-22 19:40:32 +00:00
Alan Viverette
a3875b854e
Merge "Ensure that popup width and height are correct on update" into nyc-dev
...
am: 9e6fe19
2016-03-22 19:37:23 +00:00
Alan Viverette
9e6fe19046
Merge "Ensure that popup width and height are correct on update" into nyc-dev
2016-03-22 19:31:28 +00:00
Jeff Sharkey
5e1789f4f5
Merge "Update TrafficStats SystemApi docs." into nyc-dev
...
am: c6f0d15
2016-03-22 18:43:02 +00:00
Jeff Sharkey
2a0afa5863
Merge "Throw the right exception flavor." into nyc-dev
...
am: 7067487
2016-03-22 18:43:01 +00:00
Jeff Sharkey
c6f0d15c7d
Merge "Update TrafficStats SystemApi docs." into nyc-dev
2016-03-22 18:39:52 +00:00
Jeff Sharkey
7067487821
Merge "Throw the right exception flavor." into nyc-dev
2016-03-22 18:39:39 +00:00
Adam Powell
6268e87771
Merge "Only call Drawable.setVisible(false) for visible outgoing drawables" into nyc-dev
...
am: 005b272
2016-03-22 18:21:12 +00:00
Adam Powell
005b272529
Merge "Only call Drawable.setVisible(false) for visible outgoing drawables" into nyc-dev
2016-03-22 18:16:34 +00:00
Adam Powell
35e2ea0203
Only call Drawable.setVisible(false) for visible outgoing drawables
...
In framework views where we're handling the new visibility aggregated
call we only update the drawable visibility when we're attached to a
window. For old outgoing drawables being replaced, gate this on
whether the drawable is already marked visible instead.
This catches a case where views being inflated might set drawables in
in a superclass constructor and have them replaced in a later
constructor. Gating the call into a drawable that might invoke its
callback (the view being constructed) avoids potential problems where
overridden methods are called unexpectedly on a view subclass that has
not finished running its constructor.
This is a better check than isAttachedToWindow, as isAttachedToWindow
will return false if the view has been temporarily detached from its
parent by a view-recycling container. In those cases, the view would
not correctly update the outgoing drawable.
Bug 27461617
Change-Id: I733a2dd3e3df0a8d80d5dc542ca7b30064159d5d
2016-03-22 11:14:16 -07:00
Chong Zhang
e7e66d44a7
Merge "Don\'t change geometry in relayout if preserve geometry is requested" into nyc-dev
...
am: 3db51d1
2016-03-22 18:12:54 +00:00
Chong Zhang
3db51d1999
Merge "Don't change geometry in relayout if preserve geometry is requested" into nyc-dev
2016-03-22 18:05:33 +00:00
Felipe Leme
4de3848c2e
Merge "Documented that UserDictionary is not directly available anymore." into nyc-dev
...
am: 3ef62ca
2016-03-22 17:57:18 +00:00
Felipe Leme
3ef62ca404
Merge "Documented that UserDictionary is not directly available anymore." into nyc-dev
2016-03-22 17:47:36 +00:00
Chong Zhang
6136273888
Don't change geometry in relayout if preserve geometry is requested
...
This causes scaling to be applied in the relayout window since the
requested size won't match the window size. Apply the requested size
in repositionChild instead.
bug: 27676101
Change-Id: I03beee2b9fe118a6be329b5fd1338d54e48d9a22
2016-03-22 10:28:27 -07:00
Abodunrinwa Toki
07177140e4
Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
...
Bug: 26943892
Change-Id: I1eb6bd7a9e816190b96dc1516d5874eb966385a4
2016-03-22 17:12:22 +00:00
Aga Wronska
c9f5b17df4
Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev
...
am: 5f7d673
2016-03-22 17:09:10 +00:00
Aga Wronska
5f7d673f3b
Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev
2016-03-22 17:04:28 +00:00
Jeff Sharkey
11caddafb0
Update TrafficStats SystemApi docs.
...
Bug: 25726690
Change-Id: I221d62eaaf1e0fca8c26e4f19cb25d306710a849
2016-03-22 10:20:35 -06:00
Jeff Sharkey
0c2ccd0598
Throw the right exception flavor.
...
Change-Id: Ie017fce925ed0122d3820c3f3d91e1b86982a7b1
2016-03-22 10:05:47 -06:00
Tony Mak
438b3f218d
Revert getUserInfo change and add isManagedPorfile(int userId)
...
am: 8673b28
2016-03-22 15:30:21 +00:00
Tony Mak
8673b2899e
Revert getUserInfo change and add isManagedPorfile(int userId)
...
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
2016-03-22 15:26:05 +00:00
Alan Viverette
f95b2d9aab
Ensure that popup width and height are correct on update
...
Bug: 26696843
Change-Id: I8b0409aeca02b4ad551689bdf003d95f5435e567
2016-03-22 11:23:05 -04:00
Jeff Sharkey
95e092228e
Merge "Store trace files in app-specific dirs." into nyc-dev
...
am: a17b7d0
2016-03-22 15:19:23 +00:00
Jeff Sharkey
a17b7d0163
Merge "Store trace files in app-specific dirs." into nyc-dev
2016-03-22 15:12:44 +00:00
Pierre Imai
c8419a8717
Improve NetworkCapabilities command chaining.
...
setNetworkSpecifier() now returns this.
BUG: 26797290
Change-Id: Ia8bd0836d9ac715408eca102bf4a2d23f044fa72
2016-03-22 22:29:22 +09:00
Lorenzo Colitti
2cacf7c1ec
Merge "Delete dead code." into nyc-dev
...
am: 3527a2f
2016-03-22 11:42:53 +00:00
Lorenzo Colitti
3527a2f1a2
Merge "Delete dead code." into nyc-dev
2016-03-22 11:40:29 +00:00
Benjamin Franz
37c5dff49d
Merge "Clean up some javadoc issues" into nyc-dev
...
am: 517a958
2016-03-22 11:37:26 +00:00
Benjamin Franz
517a9583a8
Merge "Clean up some javadoc issues" into nyc-dev
2016-03-22 11:30:47 +00:00
Benjamin Franz
ea95624290
Clean up some javadoc issues
...
Bug: 27672974
Bug: 25881314
Change-Id: Ida53e3bf23b2492c26f4a82878fa192110a8794f
2016-03-22 11:26:48 +00:00
Erik Kline
e96834c583
Merge "Support registering a request for the default network" into nyc-dev
...
am: d36ba73
2016-03-22 07:30:50 +00:00
