229381 Commits

Author SHA1 Message Date
Udam Saini
b6bb986889 Merge "Makes captive portal server calculation in one place." 2016-01-12 18:40:45 +00:00
Adam Powell
0c57596905 Merge "Eagerly update fragment state when moving between states" 2016-01-12 18:30:47 +00:00
Adam Powell
d1d4d9cb3a Eagerly update fragment state when moving between states
As seen in frameworks/support!

Previously we would not set a fragment's new state until the move to a
new target state was fully complete. This causes problems when other
parts of the fragment manager infrastructure (such as lazily
initializing a child fragment manager) read that state while we're
dispatching a state change call to a fragment.

In this situation, adding a child fragment and then calling
executePendingTransactions on the child FragmentManager would not have
the intended effect, as the child FragmentManager would still be in
state INITIALIZING. The expected lifecycle callbacks to the child
fragment would then occur later.

Fix this by updating the fragment state as we go through each phase of
moveToState before we dispatch to the associated onState method,
matching our usual pattern of invoking onFoo methods after foo has
occurred. Delete the redundant resumed field as we now can use the
state directly.

Bug 25019275

Change-Id: I97fe45578d59ab643c9779eaeb475a331e446335
2016-01-12 10:26:16 -08:00
Sudheer Shanka
9ec29e3d6d Merge "Move restricted padlock support to SettingsLib" 2016-01-12 18:25:00 +00:00
Gustav Sennton
32895546c6 Merge "More string resources for WebView implementation setting." 2016-01-12 18:14:45 +00:00
Sudheer Shanka
7ff866d286 Move restricted padlock support to SettingsLib
Change-Id: Ib0b1c58d1f45e017b6b17ce0a55ca839b900cba4
2016-01-12 18:14:24 +00:00
Joseph Pirozzo
951bc3b514 Merge "Update Activity Manager to prevent popups while driving." 2016-01-12 18:01:25 +00:00
Alan Viverette
b06271db81 Merge "Don't explicitly set the title's layout direction" 2016-01-12 17:48:42 +00:00
Jeff Tinker
c8c0de38d1 Merge "Support AES-CBC sample encryption in MediaDrm" 2016-01-12 17:42:16 +00:00
Philip P. Moltmann
6ec7ed2f96 Merge "Deal with UserState#getEnabledPrintServices returning null." 2016-01-12 17:18:20 +00:00
Tony Mantler
231c9fd727 Merge "Move a bunch of app restrictions logic to SettingsLib" 2016-01-12 17:17:00 +00:00
Tony Mantler
e662ca6b5e Move a bunch of app restrictions logic to SettingsLib
Change-Id: I68cd6304164744fd0676d13ef6badffac79adab5
2016-01-12 09:16:21 -08:00
Philip P. Moltmann
05e3423070 Deal with UserState#getEnabledPrintServices returning null.
Bug: 26492364
Change-Id: I234b1632168c88d32bdd134630442756701118b6
2016-01-12 09:13:21 -08:00
Alan Viverette
866d37d3c9 Merge "Apply Spinner dropDownSelector value from XML" 2016-01-12 15:52:32 +00:00
Alan Viverette
0ef12aefe5 Clean up LayerDrawable, refactoring only
Uses consistent naming and ordering for padding and inset calculations.
Updates documentation to include UNDEFINED_INSET as public API, since we
return the value and will accept the value as a valid param. Flattens
out RTL logic for readability.

Change-Id: Ie704e2e5fc7f5763500ebe1217ddbbf4d0c5ef86
2016-01-12 09:47:09 -05:00
Victor Chang
c754dffe19 Merge "Create a new device policy for controlling work contacts search" 2016-01-12 11:51:01 +00:00
Victor Chang
1060c61866 Create a new device policy for controlling work contacts search
BUG=25981902

Change-Id: I5cea59d7d09bf54051ae0e56e824e4d3a08a49e7
2016-01-12 11:31:16 +00:00
Daichi Hirono
0ec4312475 Merge "Remove unused lines in MtpDocumentsProvider." 2016-01-12 04:23:07 +00:00
Tyler Gunn
f5afe6ab8d Merge "Add KEY_USE_RCS_PRESENCE_BOOL carrier config option." 2016-01-12 03:59:29 +00:00
Tyler Gunn
3e122f76f1 Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.
- New carrier config option is used to determine if presence is used
to determine whether a contact is capable of video calling.
- Also, improve logging for PhoneAccount capabilities.

Bug: 20257833
Change-Id: Ifcc7df95677eb4399f08eb8849c4004892957e90
2016-01-11 19:25:00 -08:00
Daichi Hirono
d7c46bdec1 Merge "Reland "Add event parameters to MtpEvent."" 2016-01-12 03:20:45 +00:00
Jeff Sharkey
9229ee5959 Merge "Install non-EA providers once user is unlocked." 2016-01-12 03:16:22 +00:00
Daichi Hirono
2a9a43369b Reland "Add event parameters to MtpEvent."
The CL was previously reviewed at ag/842930.

> We can obtain detailed information of MtpEvent from devices. e.g. object
> handle of changed object.  The CL adds the detailed information as
> properties of MtpEvent class.
>
> BUG=26480986

Change-Id: I93afad9caf118d74cd0923d70242133c4fb2a648
2016-01-12 12:14:30 +09:00
Daichi Hirono
8f124a9a97 Merge "Revert "Add event parameters to MtpEvent."" 2016-01-12 02:34:03 +00:00
Tyler Gunn
794d9e88af Merge "Adding @IntDef checking for Video Quality and Video State values." 2016-01-12 02:32:19 +00:00
Daichi Hirono
497f806350 Revert "Add event parameters to MtpEvent."
This reverts commit 592356b63f7446eec2e521a5649e986582183c49.

Change-Id: I9d5eae69c20c914d7946d4e933ada905f428dcb6
2016-01-12 02:31:48 +00:00
Daichi Hirono
0c66554a9a Merge "Add event parameters to MtpEvent." 2016-01-12 02:27:46 +00:00
Chris Craik
ae10e1368c Merge "Fix clip serialization crash" 2016-01-12 02:14:29 +00:00
Chris Craik
15f046866c Fix clip serialization crash
Can't safely rewind clip allocations, since those pointers are cached by
ClipArea. Instead add early rejection to handle most cases, and update
tests.

Change-Id: Ic32f95cf95602f427f25761a8da1583c4495f36d
2016-01-11 17:54:49 -08:00
Filip Gruszczynski
2e263c4a12 Merge "Deliver onNewIntent before onResume when launching recents." 2016-01-12 01:49:12 +00:00
Filip Gruszczynski
e826f327cf Deliver onNewIntent before onResume when launching recents.
Bug: 25837292
Change-Id: I9da5d2a87c0e33006ef1488dfab5389911955922
2016-01-11 17:47:58 -08:00
Chong Zhang
f2c9628cac Merge "Apply scroll to windows added to a non-resizeble task that's docked" 2016-01-12 01:39:26 +00:00
Chong Zhang
2a88fc31cf Apply scroll to windows added to a non-resizeble task that's docked
bug: 26447921
Change-Id: I933e277137fb127a9e961035cf48cba2bef52042
2016-01-11 17:15:40 -08:00
Jeff Tinker
d4ea5d3eb6 Support AES-CBC sample encryption in MediaDrm
bug:23719082
Change-Id: I06eb39bd8ad9b55ea0da4011258cac62a8c21ae1
2016-01-11 17:11:51 -08:00
Chet Haase
fadc86666f Merge "Don't double-set keyframe values when Property exists" 2016-01-12 00:51:36 +00:00
Chet Haase
406a02b59d Don't double-set keyframe values when Property exists
There is logic in PVH.setupValue() that sets the value of
the appropriate keyframe from a Property, if that Property object
exists for the animator. But after that is done, it goes ahead and sets
the same keyframe value based on the getter for the target object.
This is not only redundant; it is wrong (in the odd situation in which
a getter would return something different than Property.get()).

The solution is to return early once we've set the value with the
Property object.

Issue #26471646  PropertyValuesHolder uses reflection in setupValue when a Property is being used

Change-Id: I12634a25661400f13f44872ba17625b32e93ca19
2016-01-11 16:27:20 -08:00
Todd Kennedy
12705131b9 Hide ephemerality
Change-Id: Ibf60366b3f00b1920e330cd804bcc1c550f8882a

Bug: 26404647
2016-01-11 16:21:03 -08:00
Yohei Yukawa
f55ed12fd1 Merge "Enrich JavaDoc for IC#deleteSurroundingText()." 2016-01-12 00:08:39 +00:00
Filip Gruszczynski
7c132d82c5 Merge "Start recents when bringing docked task to the front." 2016-01-11 23:54:00 +00:00
Winson Chung
f273418b07 Merge "Snap docked stack after screen rotation" 2016-01-11 23:44:55 +00:00
Chris Craik
e3dc1fe215 Merge "Rename OpReorderer to FrameReorderer" 2016-01-11 23:44:17 +00:00
Filip Gruszczynski
303210bbdd Start recents when bringing docked task to the front.
We don't want the docked activity to be on top by itself, so we need to
force the recents to come up to.

Bug: 25838525
Change-Id: Icb8184db5cc67e536561674b887bf481595257cc
2016-01-11 15:41:07 -08:00
Chris Craik
5ea1724be4 Rename OpReorderer to FrameReorderer
Also separate LayerReorderer into its own files.

Change-Id: Iafb6a156f760f62f831f6288fd0dadf1db25da24
2016-01-11 15:35:52 -08:00
Steve McKay
da161f0b17 Merge "Fix bug where both list and grid buttons are visible." 2016-01-11 23:33:00 +00:00
Chris Craik
987635710f Merge "Fix path position in BakedOpDispatcher" 2016-01-11 23:13:28 +00:00
George Mount
6b99325be9 Merge "Change access to action bar to control-<" 2016-01-11 23:12:00 +00:00
Jorim Jaggi
737af724eb Snap docked stack after screen rotation
- Move DividerSnapAlgorithm to com.android.internal, also move
some utility stuff into DividerUtils which is used from both
SystemUI and window manager
- When the screen rotation changes, rotate the stacks like before
but then also snap the docked stack to a valid snap position.

Change-Id: I9e1aa13f42f398a25c9016e6f20395ee212e405b
2016-01-11 23:05:56 +00:00
Aga Wronska
d3b8e52009 Merge "Keep Search View visible after search completed Improve Search View behavior Add Search View background color" 2016-01-11 23:05:43 +00:00
Aga Wronska
97831485e7 Keep Search View visible after search completed
Improve Search View behavior
Add Search View background color

Bug:26143355
Change-Id: Ifdc4bfff56fc6244c571dfbeff4179e1515d53b7
2016-01-11 14:58:18 -08:00
Julia Reynolds
04fc35428f Merge "Notification banning updates." 2016-01-11 21:32:37 +00:00