OSDN Git Service

android-x86/frameworks-base.git
8 years agoFixed unexpected configuration change causing activity relaunch
Wale Ogunwale [Fri, 20 Nov 2015 17:36:46 +0000 (09:36 -0800)]
Fixed unexpected configuration change causing activity relaunch

In commit ebcc875f we migrated the setting of the task override
configuration from WM to AM. However, the migration changed the
construction of the override configuration to take in the service
configuration as the starting value. This is incorrect since the
only values that should be set in the override configuration are
the ones that change due to resizing. We now seed the override
configuration with the EMPTY value to make it obvious that the
object should be constructed with the default values.

Also, fixed issue with WM telling activity manager to resize a stack
when the stack is already the size it wants.

Bug: 25776219
Change-Id: I882979aa87b49e7a5dc993bd9223fbd6e6cf6471

8 years agoUse HexDump instead of java.lang.IntegralToString
Przemyslaw Szczepaniak [Thu, 15 Oct 2015 10:04:19 +0000 (11:04 +0100)]
Use HexDump instead of java.lang.IntegralToString

java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.

Bug: 24932279
(cherry-picked from 15fc0548a536750110e159e06a39ba943eccdd81)

Change-Id: Id6ab88337af12d93cd73c41775b9d5baa1e61d96

8 years agoMerge "Set mTempCalendar in TimePickerSpinnerDelegate"
Alan Viverette [Fri, 20 Nov 2015 14:10:48 +0000 (14:10 +0000)]
Merge "Set mTempCalendar in TimePickerSpinnerDelegate"

8 years agoAdd core-oj to the list of core library jars.
Piotr Jastrzebski [Tue, 17 Feb 2015 16:58:52 +0000 (16:58 +0000)]
Add core-oj to the list of core library jars.

With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry-picked from f898cda2f499b14f92bc7fb75f44110cdec7654f)

Change-Id: Ica148f11bcc77f57d22944ff78c501611a293167

8 years agoMerge "Add Work Contacts Directory APIs"
Ricky Wai [Fri, 20 Nov 2015 12:33:11 +0000 (12:33 +0000)]
Merge "Add Work Contacts Directory APIs"

8 years agoMerge "Add per-user version of DevicePolicyManager.getUserRestrictions."
Sudheer Shanka [Fri, 20 Nov 2015 12:23:54 +0000 (12:23 +0000)]
Merge "Add per-user version of DevicePolicyManager.getUserRestrictions."

8 years agoMerge "Add an extra for the logo uri to DevicePolicyManager."
Nicolas Prévot [Fri, 20 Nov 2015 11:37:02 +0000 (11:37 +0000)]
Merge "Add an extra for the logo uri to DevicePolicyManager."

8 years agoAdd first-class support for virtual files in SAF.
Tomasz Mikolajewski [Mon, 16 Nov 2015 02:41:28 +0000 (11:41 +0900)]
Add first-class support for virtual files in SAF.

Bug: 20820363
Change-Id: Ic509a6003a99997126f129a836fdd8c0e843108f

8 years agoMerge "Make Paint.hasGlyph variation selector aware."
Seigo Nonaka [Fri, 20 Nov 2015 05:45:26 +0000 (05:45 +0000)]
Merge "Make Paint.hasGlyph variation selector aware."

8 years agoImport translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours...
Geoff Mendal [Fri, 20 Nov 2015 03:56:34 +0000 (03:56 +0000)]
Import translations. DO NOT MERGE am: bddde9b83d  -s ours am: d0709c3a32  -s ours am: 1bd58bfd5b  -s ours am: fd773d1ba7  -s ours am: b1a5fef946  -s ours
am: 4943634c10  -s ours

* commit '4943634c10e7973400404e9e6b0b7de0b494f770':
  Import translations. DO NOT MERGE

8 years agoMerge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""...
Deepanshu Gupta [Fri, 20 Nov 2015 03:55:07 +0000 (03:55 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 am: 2d887558df am: 0627cd0c40
am: adca23bb4c

* commit 'adca23bb4c59b1514b5d86f1ab8100c400d7a71e':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""

8 years agoMerge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc...
Deepanshu Gupta [Fri, 20 Nov 2015 03:53:45 +0000 (03:53 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465 am: 4d9df358ec
am: 138a901db4

* commit '138a901db492989ae7db53d664cac698cc5bfdc7':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Fri, 20 Nov 2015 03:52:20 +0000 (03:52 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 am: 5d41bd8d1a am: c1552f0caf am: 38a3b2154c
am: 9ebdd27142

* commit '9ebdd271422cb4a091f3b467899506cebb0fa944':
  Don't use framework permission strings for netd permissions.

8 years agoMerge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd am: cb948af246
Vineeta Srivastava [Fri, 20 Nov 2015 03:50:46 +0000 (03:50 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd am: cb948af246
am: 8e8c12acfa

* commit '8e8c12acfa946346a28c031653aa93caaee7c7cb':
  Fix MVNO hotspot bug for Europe

8 years agoMerge "Prevent SurfaceView flash while resizing."
Rob Carr [Fri, 20 Nov 2015 02:45:20 +0000 (02:45 +0000)]
Merge "Prevent SurfaceView flash while resizing."

8 years agoPrevent SurfaceView flash while resizing.
Robert Carr [Wed, 18 Nov 2015 21:37:46 +0000 (13:37 -0800)]
Prevent SurfaceView flash while resizing.

We need to make sure we do not preserve
and destroy attached windows when entering
drag resize as we will not swap these windows
to the big surface. On a similar note,
we need to make sure we do not hide child windows
when destroying the parent window for preservation.

Change-Id: I98e02f08d0ea2d5f0032ec7691e865c536df19c6

8 years agoImport translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours...
Geoff Mendal [Fri, 20 Nov 2015 01:56:21 +0000 (01:56 +0000)]
Import translations. DO NOT MERGE am: bddde9b83d  -s ours am: d0709c3a32  -s ours am: 1bd58bfd5b  -s ours am: fd773d1ba7  -s ours
am: b1a5fef946  -s ours

* commit 'b1a5fef946bf5ec1c9bb59696cad9534ba72190b':
  Import translations. DO NOT MERGE

8 years agoMerge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""...
Deepanshu Gupta [Fri, 20 Nov 2015 01:55:01 +0000 (01:55 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 am: 2d887558df
am: 0627cd0c40

* commit '0627cd0c404838a0251ee359ed75041f430fa83b':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""

8 years agoMerge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc...
Deepanshu Gupta [Fri, 20 Nov 2015 01:53:43 +0000 (01:53 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465
am: 4d9df358ec

* commit '4d9df358ec847262872c09962105537be350f8fd':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Fri, 20 Nov 2015 01:52:25 +0000 (01:52 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 am: 5d41bd8d1a am: c1552f0caf
am: 38a3b2154c

* commit '38a3b2154c7ee5d75b5670abaa4c154edd3c36eb':
  Don't use framework permission strings for netd permissions.

8 years agoMerge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd
Vineeta Srivastava [Fri, 20 Nov 2015 01:51:01 +0000 (01:51 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd
am: cb948af246

* commit 'cb948af2469ca3869d368c0162dd459912afb0b9':
  Fix MVNO hotspot bug for Europe

8 years agoMerge "resolve merge conflicts of 723462eba9 to master."
Guang Zhu [Fri, 20 Nov 2015 01:46:25 +0000 (01:46 +0000)]
Merge "resolve merge conflicts of 723462eba9 to "

8 years agoresolve merge conflicts of 723462eba9 to master.
Guang Zhu [Fri, 20 Nov 2015 01:43:28 +0000 (17:43 -0800)]
resolve merge conflicts of 723462eba9 to master.

Change-Id: I34f085ba12ab2602a144a2cbd933cfd5c030748f

8 years agoImport translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours...
Geoff Mendal [Fri, 20 Nov 2015 01:40:42 +0000 (01:40 +0000)]
Import translations. DO NOT MERGE am: bddde9b83d  -s ours am: d0709c3a32  -s ours am: 1bd58bfd5b  -s ours
am: fd773d1ba7  -s ours

* commit 'fd773d1ba76c29b8888c71906ef44ec09a551627':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours
Geoff Mendal [Fri, 20 Nov 2015 01:30:35 +0000 (01:30 +0000)]
Import translations. DO NOT MERGE am: bddde9b83d  -s ours am: d0709c3a32  -s ours
am: 1bd58bfd5b  -s ours

* commit '1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE am: bddde9b83d -s ours
Geoff Mendal [Fri, 20 Nov 2015 01:25:11 +0000 (01:25 +0000)]
Import translations. DO NOT MERGE am: bddde9b83d  -s ours
am: d0709c3a32  -s ours

* commit 'd0709c3a329ce555d9d968bc1808fec5bcc1fb10':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:15:04 +0000 (01:15 +0000)]
Import translations. DO NOT MERGE
am: bddde9b83d  -s ours

* commit 'bddde9b83db2bab9343cbe107d3672fea5314d4b':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:06:56 +0000 (17:06 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2

8 years agoMerge "Remove the aidl tool" into mnc-dr2-dev am: 8d31b08904
Alex Deymo [Fri, 20 Nov 2015 00:18:01 +0000 (00:18 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev am: 8d31b08904
am: f7d10eca49

* commit 'f7d10eca499fee37d8dfc89ec6779a7b46c70be5':
  Remove the aidl tool

8 years agoadd lost RAM info to compact meminfo dump am: 877c6c7742
Guang Zhu [Fri, 20 Nov 2015 00:01:31 +0000 (00:01 +0000)]
add lost RAM info to compact meminfo dump am: 877c6c7742
am: b681ec0219

* commit 'b681ec02194039768767215b2479507742288c98':
  add lost RAM info to compact meminfo dump

8 years agoMerge "Add "Home" directory support."
Steve McKay [Fri, 20 Nov 2015 00:01:25 +0000 (00:01 +0000)]
Merge "Add "Home" directory support."

8 years agoAdd "Home" directory support.
Steve McKay [Wed, 18 Nov 2015 22:56:50 +0000 (14:56 -0800)]
Add "Home" directory support.

Update FilesActivityUiTests to verify Home is present
    and that clicking a root sets the title accordingly.
Guard addition of WRITABLE flag with a volume test.

Bug: 25147243
Change-Id: Ic20372737cae08a82af0aade0c0dbbd8c22d5f34

8 years agoMerge "Added a placeholder home activity for system user"
Fyodor Kupolov [Thu, 19 Nov 2015 23:52:45 +0000 (23:52 +0000)]
Merge "Added a placeholder home activity for system user"

8 years agoMerge "Remove the aidl tool" into mnc-dr2-dev
Alex Deymo [Thu, 19 Nov 2015 23:50:25 +0000 (23:50 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev
am: 8d31b08904

* commit '8d31b089040dafefee16033176a884d43e259804':
  Remove the aidl tool

8 years agoMerge "Support LocaleLists in ActivityManagerService."
Roozbeh Pournader [Thu, 19 Nov 2015 23:44:22 +0000 (23:44 +0000)]
Merge "Support LocaleLists in ActivityManagerService."

8 years agoMerge "AAPT2: Fail compiling when private symbols are referenced"
Adam Lesinski [Thu, 19 Nov 2015 23:43:08 +0000 (23:43 +0000)]
Merge "AAPT2: Fail compiling when private symbols are referenced"

8 years agoMerge "Add gesture to drag in recents from navigation bar"
Jorim Jaggi [Thu, 19 Nov 2015 23:23:01 +0000 (23:23 +0000)]
Merge "Add gesture to drag in recents from navigation bar"

8 years agoMerge "More work on layered user restrictions."
Makoto Onuki [Thu, 19 Nov 2015 22:53:37 +0000 (22:53 +0000)]
Merge "More work on layered user restrictions."

8 years agoMerge "Revert "Fix broken build""
Vladislav Kaznacheev [Thu, 19 Nov 2015 22:50:49 +0000 (22:50 +0000)]
Merge "Revert "Fix broken build""

8 years agoRevert "Fix broken build"
Vladislav Kaznacheev [Thu, 19 Nov 2015 22:50:33 +0000 (22:50 +0000)]
Revert "Fix broken build"

This reverts commit 88d753291c834c41ad6c9229082146be72cf8014.

Revert required because the base class change
has been reverted in http://ag/816441

Change-Id: Iee8a8272bda0a92aed8ae46af8439910d8f1ecdc

8 years agoMerge "Track by which client the last focused window was reported."
Yohei Yukawa [Thu, 19 Nov 2015 22:49:40 +0000 (22:49 +0000)]
Merge "Track by which client the last focused window was reported."

8 years agoAAPT2: Fail compiling when private symbols are referenced
Adam Lesinski [Tue, 17 Nov 2015 01:35:44 +0000 (17:35 -0800)]
AAPT2: Fail compiling when private symbols are referenced

Also moved some XML specific stuff into its own directory,
and refactored ReferenceLinker a bit.

Change-Id: I912247a82023c1bbf72dc191fbdaf62858cbec0c

8 years agoSupport LocaleLists in ActivityManagerService.
Roozbeh Pournader [Thu, 19 Nov 2015 01:41:24 +0000 (17:41 -0800)]
Support LocaleLists in ActivityManagerService.

Also add a placeholder method for locale negotiation to LocaleList,
to be filled later.

There is no change in behavior expected by this CL yet. But once we
support setting the first locale to something the system doesn't
support, and implement the locale negotiation, this will cause the
system locale to be set to the first supported locale, instead of
just the default from Settings.

Change-Id: Iec983a5707daffb5bf54eac79ff0856a96631960

8 years agoMerge "Revert "Implement View.cancelDrag""
Vladislav Kaznacheev [Thu, 19 Nov 2015 22:23:35 +0000 (22:23 +0000)]
Merge "Revert "Implement View.cancelDrag""

8 years agoRevert "Implement View.cancelDrag"
Vladislav Kaznacheev [Thu, 19 Nov 2015 22:20:06 +0000 (22:20 +0000)]
Revert "Implement View.cancelDrag"

This reverts commit 93cf731b26e2ab4db49bd80f60675b03e40512f3.

This is required because adding View.cancelDrag conflicts with existing app code.

Change-Id: I323fc5d2144266781d3168fe033c53cb5b37050e

8 years agoSet mTempCalendar in TimePickerSpinnerDelegate
Alan Viverette [Thu, 19 Nov 2015 22:10:54 +0000 (17:10 -0500)]
Set mTempCalendar in TimePickerSpinnerDelegate

A previous CL removed setLocale(), which had been initializing the temp
calendar. This CL also makes the calendar final, since the locale is only
set once during construction.

Bug: 25776094
Change-Id: If0af34df3120a7c4b1667129a553b9f8b7ec1999

8 years agoAdd gesture to drag in recents from navigation bar
Jorim Jaggi [Wed, 18 Nov 2015 23:57:38 +0000 (15:57 -0800)]
Add gesture to drag in recents from navigation bar

Change-Id: I672ed08f1019835891411b87e2d0de0290defff7

8 years agoMore work on layered user restrictions.
Makoto Onuki [Mon, 16 Nov 2015 21:51:27 +0000 (13:51 -0800)]
More work on layered user restrictions.

- Now when DO/PO sets a user restriction, DPMS pushes it to UMS and
then UMS persists it, in order for UserManager.hasUserRestriction()
to never have to talk with DPMS, which would cause lock inversion.

- Also apply user restrictions when a user start.

- This is an updated version of the abandoned CL -- the difference
is, ActivityManager no longer has to call DPMS.

- Also removed an unnecessary write to userlist.xml in UMS.
upgradeIfNecessaryLP().

Bug 23902097
Bug 25388912
Bug 25354031
Bug 25641040

Change-Id: I0948aea06ad7d0f45fe612a431d765faddfe3c58

8 years agoMerge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""...
Deepanshu Gupta [Thu, 19 Nov 2015 21:10:57 +0000 (21:10 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495
am: 2d887558df

* commit '2d887558dfa0b46fde5663fb494e2230febeaccc':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""

8 years agoMerge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc...
Deepanshu Gupta [Thu, 19 Nov 2015 21:09:24 +0000 (21:09 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0
am: 867c370465

* commit '867c3704652d40118b47e9c97149e7fd9567a16b':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"

8 years agoAdded a placeholder home activity for system user
Fyodor Kupolov [Wed, 18 Nov 2015 19:07:00 +0000 (11:07 -0800)]
Added a placeholder home activity for system user

Standard launcher can be uninstalled for system user. A low priority
placeholder home activity is used to make sure the system can always
boot. By default the component is disabled for all users, and is only enabled
for the system user at boot time.

Bug: 25726710
Change-Id: I97eed02c9e2bbd69a737cc1d203110bed837b803

8 years agoMerge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""...
Deepanshu Gupta [Thu, 19 Nov 2015 21:00:17 +0000 (21:00 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
am: 35f7562495

* commit '35f75624958bc061764c7cc71843ca7ea60c0666':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""

8 years agoMerge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc...
Deepanshu Gupta [Thu, 19 Nov 2015 20:58:52 +0000 (20:58 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
am: 8c971ae5a0

* commit '8c971ae5a0d294175481426d4543e23dc8d4a349':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"

8 years agoMerge "Add Quick Settings API"
Jason Monk [Thu, 19 Nov 2015 20:55:14 +0000 (20:55 +0000)]
Merge "Add Quick Settings API"

8 years agoMerge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""...
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:55 +0000 (20:49 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev

8 years agoRevert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:35 +0000 (20:49 +0000)]
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""

This reverts commit 65a834980cdbb9407a3f27e48cd0a8c472182cd6.

The original revert was only for cherry-pick to release
branch.

Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e

8 years agoMerge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc...
Deepanshu Gupta [Thu, 19 Nov 2015 20:48:52 +0000 (20:48 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev

8 years agoRevert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Deepanshu Gupta [Thu, 19 Nov 2015 20:47:26 +0000 (20:47 +0000)]
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"

This reverts commit 631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.

The revert is only for cherry-pick back to mnc-sdk-release.

Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c

8 years agoMerge "Install the Network Security Config Provider"
Chad Brubaker [Thu, 19 Nov 2015 20:42:37 +0000 (20:42 +0000)]
Merge "Install the Network Security Config Provider"

8 years agoAdd Quick Settings API
Jason Monk [Fri, 6 Nov 2015 20:47:26 +0000 (15:47 -0500)]
Add Quick Settings API

It is a little bit limited right now, but it contains
the lifecycle of a tile getting added/removed, and
listening/not listening and clicks.

SysUI side will need some cleanup later on.

Change-Id: I4db803c8a271f8bf44f2ef710517969a84a95cf0

8 years agoMerge "API for overlaying app content over decor caption in freeform windows."
Filip Gruszczynski [Thu, 19 Nov 2015 19:51:55 +0000 (19:51 +0000)]
Merge "API for overlaying app content over decor caption in freeform windows."

8 years agoRefactor hwuitest
John Reck [Tue, 17 Nov 2015 23:51:08 +0000 (15:51 -0800)]
Refactor hwuitest

Yank animations out into their own files

Change-Id: Iea522ee032752019c07ff308c3a3993011054308

8 years agoMerge "Add support for partial view layouts"
Adam Powell [Thu, 19 Nov 2015 18:59:06 +0000 (18:59 +0000)]
Merge "Add support for partial view layouts"

8 years agoMerge "Allow ephemeral provider/installer"
Todd Kennedy [Thu, 19 Nov 2015 18:54:57 +0000 (18:54 +0000)]
Merge "Allow ephemeral provider/installer"

8 years agoMerge "Tweak grid item layout. Adjust colors to match spec."
Ben Kwa [Thu, 19 Nov 2015 18:52:55 +0000 (18:52 +0000)]
Merge "Tweak grid item layout.  Adjust colors to match spec."

8 years agoMerge "Fixed typos."
Felipe Leme [Thu, 19 Nov 2015 18:50:48 +0000 (18:50 +0000)]
Merge "Fixed typos."

8 years agoTweak grid item layout. Adjust colors to match spec.
Ben Kwa [Wed, 11 Nov 2015 05:02:47 +0000 (21:02 -0800)]
Tweak grid item layout.  Adjust colors to match spec.

BUG=10960718
BUG=24326989

Change-Id: I74da23fe0b40d713a3f435d1467d26d707e76fca

8 years agoMerge "Implement flexible light idle maintenance windows."
Dianne Hackborn [Thu, 19 Nov 2015 18:48:46 +0000 (18:48 +0000)]
Merge "Implement flexible light idle maintenance windows."

8 years agoMerge "Move appops command to the service."
Dianne Hackborn [Thu, 19 Nov 2015 18:47:53 +0000 (18:47 +0000)]
Merge "Move appops command to the service."

8 years agoMerge "More file-based encryption work."
Jeff Sharkey [Thu, 19 Nov 2015 18:45:40 +0000 (18:45 +0000)]
Merge "More file-based encryption work."

8 years agoMerge "allow devs to turn off charging notifications"
Chris Wren [Thu, 19 Nov 2015 18:45:28 +0000 (18:45 +0000)]
Merge "allow devs to turn off charging notifications"

8 years agoAPI for overlaying app content over decor caption in freeform windows.
Filip Gruszczynski [Wed, 18 Nov 2015 22:43:01 +0000 (14:43 -0800)]
API for overlaying app content over decor caption in freeform windows.

Bug: 25486369

Change-Id: I8fba30dd690d9f0ccc48149f57ce254286b0c2ae

8 years agoMerge "Fix crash when docking from recents."
Filip Gruszczynski [Thu, 19 Nov 2015 18:27:01 +0000 (18:27 +0000)]
Merge "Fix crash when docking from recents."

8 years agoAllow ephemeral provider/installer
Todd Kennedy [Wed, 18 Nov 2015 17:59:47 +0000 (09:59 -0800)]
Allow ephemeral provider/installer

The ephemeral provider is a service that simply determines whether or
not an ephemeral application is available. The ephemeral installer
does the heavy lifting of installing the ephemeral application.

Bug: 25119046
Change-Id: I591f4c2c3f2b149d299fa8b4f359f2582d9199cb

8 years agoFix crash when docking from recents.
Filip Gruszczynski [Thu, 19 Nov 2015 02:01:27 +0000 (18:01 -0800)]
Fix crash when docking from recents.

The crash was happening because we were sending a future from sysui, but
that future would always return null animation specs when docking. This
makes it returns proper specs in that case. However, we need to still
protect ourselves from null specs when executing the future.

Bug: 25765339
Change-Id: I02d842ea31503169f6e053a1695d8896d2e4d97c

8 years agoMerge "metrics for people validation"
Chris Wren [Thu, 19 Nov 2015 18:03:15 +0000 (18:03 +0000)]
Merge "metrics for people validation"

8 years agoMore file-based encryption work.
Jeff Sharkey [Fri, 13 Nov 2015 04:17:45 +0000 (20:17 -0800)]
More file-based encryption work.

Add new "am unlock-user" command so we can trigger changes from the
command line.

Move FBE check to static method so it can safely be called early
during boot before the mount service is ready.  Move FBE emulation
to persisted system property, and start reading/writing that value.

Change default permission grants to ignore current encryption-aware
flags, since many of the target apps aren't crypto aware.

Always prepare package data directories, which is how we create the
new "user_de" paths during boot.

Bug: 22358539
Change-Id: I6f58ea2d34b3a466d3775d614f8a13de92272621

8 years agoAdd an extra for the logo uri to DevicePolicyManager.
Nicolas Prevot [Thu, 12 Nov 2015 17:40:12 +0000 (17:40 +0000)]
Add an extra for the logo uri to DevicePolicyManager.

Define an extra apps can use to pass an image that will
be shown during the provisioning.

BUG:25660734
Change-Id: I63674d56c7135a6106c4b32f9d45fa9377368e30

8 years agoallow devs to turn off charging notifications
Chris Wren [Thu, 19 Nov 2015 17:40:53 +0000 (12:40 -0500)]
allow devs to turn off charging notifications

in the same was as we allow then to turn of debuging notificaitons
this is useful for screenshots and demos

Change-Id: I6e95addec2917abdd619086ed68910097fb5b8aa

8 years agometrics for people validation
Chris Wren [Thu, 19 Nov 2015 17:39:38 +0000 (12:39 -0500)]
metrics for people validation

Change-Id: If53bb740ca3760e7335c93ad140bae2029d422b7

8 years agoAdd support for partial view layouts
Adam Powell [Thu, 18 Dec 2014 23:22:26 +0000 (15:22 -0800)]
Add support for partial view layouts

Traditionally, when a view called requestLayout it would force
recursive requestLayout calls for all parent views up the
hierarchy. This meant that there was no way to determine at traversal
time whether a parent view itself needed layout, or if just one of its
descendants did.

Add a ViewParent method requestPartialLayoutForChild(View). This lets
a caller state that a particular child of a given parent needs a
remeasure and relayout at its current measured size and position
within that parent. This can help prevent the full-tree relayout often
caused by otherwise trivial changes. Partial layouts are processed
after any pending "full" relayout during ViewRoot traversals, but
before drawing.

Add a ViewGroup method requestLayoutForChild(View). This lets a
ViewGroup decide whether it is more appropriate to request a
traditional relayout or a partial layout for itself or just the child
that changed.

Add a ViewParent method findDependentLayoutAxes. This allows a caller
to check if the ViewParent's layout is dependent on a specific direct
child view along one or both axes. Called recursively, this can be
used to determine if a change in a child view can be isolated to a
partial layout, even if its direct parent's own layout is tied to its
other ancestors. (e.g. MATCH_PARENT, LinearLayout weights)

Implement ViewGroup#requestPartialLayoutForChild to call new
ViewParent method findDependentLayoutAxes and based on the result,
either request a full layout for itself or a partial layout for the
child in question.

Implement findDependentLayoutAxes for common framework ViewGroups. A
private implementation in ViewGroup is available for use by framework
classes that will deal with basic LayoutParams. These implementations
specifically check for derived LayoutParams classes and abort the
optimization if they find something beyond their expected parameter
types.

Change-Id: I0a1a9b79293d17d4fae8d9892b96d3586f9401ae

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 17:30:05 +0000 (17:30 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 am: 5d41bd8d1a
am: c1552f0caf

* commit 'c1552f0caf26bc79e5de6fdd15aa97900d6fd4aa':
  Don't use framework permission strings for netd permissions.

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 17:20:09 +0000 (17:20 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0
am: 5d41bd8d1a

* commit '5d41bd8d1acd894cef1aff9018614194df6f95ab':
  Don't use framework permission strings for netd permissions.

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 17:10:45 +0000 (17:10 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500
am: 6d983179a0

* commit '6d983179a047ff0e69fc06c06d3b9b06c32406ae':
  Don't use framework permission strings for netd permissions.

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 16:59:45 +0000 (16:59 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801
am: 974f805500

* commit '974f8055005a3d75e45cab89badd9ef183a75107':
  Don't use framework permission strings for netd permissions.

8 years agoMerge "Do not restart printSpooler when switching portait mode / landscape mode"
Philip P. Moltmann [Thu, 19 Nov 2015 16:56:57 +0000 (16:56 +0000)]
Merge "Do not restart printSpooler when switching portait mode / landscape mode"

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 16:50:11 +0000 (16:50 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205
am: b776891801

* commit 'b7768918014d34c2e4d74abefeb03956aee421fc':
  Don't use framework permission strings for netd permissions.

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 16:40:35 +0000 (16:40 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790
am: 33c1718205

* commit '33c17182058ce0f9d0bae48467827ff52422cdd2':
  Don't use framework permission strings for netd permissions.

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 16:30:59 +0000 (16:30 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7
am: d3b6e2d790

* commit 'd3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
  Don't use framework permission strings for netd permissions.

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012 am:...
Sreeram Ramachandran [Thu, 19 Nov 2015 16:20:26 +0000 (16:20 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd
am: 42faa221d7

* commit '42faa221d7e8bc6db32698b3528e9c5898dbb943':
  Don't use framework permission strings for netd permissions.

8 years agoMerge "Update framework code after new ART options." am: d7d2817ade am: 9da4055766
Nicolas Geoffray [Thu, 19 Nov 2015 16:15:17 +0000 (16:15 +0000)]
Merge "Update framework code after new ART options." am: d7d2817ade am: 9da4055766
am: 5d5f055eb6

* commit '5d5f055eb6783dceb51cdb71630aac40feacfedd':
  Update framework code after new ART options.

8 years agoDon\'t use framework permission strings for netd permissions. am: f1f45fe012
Sreeram Ramachandran [Thu, 19 Nov 2015 16:10:19 +0000 (16:10 +0000)]
Don\'t use framework permission strings for netd permissions. am: f1f45fe012
am: 0b542630dd

* commit '0b542630dd8b4d43f2e4f70563d3e44bb680455f':
  Don't use framework permission strings for netd permissions.

8 years agoMerge "Update framework code after new ART options." am: d7d2817ade
Nicolas Geoffray [Thu, 19 Nov 2015 16:05:01 +0000 (16:05 +0000)]
Merge "Update framework code after new ART options." am: d7d2817ade
am: 9da4055766

* commit '9da4055766fc7acf81dcd238204589ea1f484d50':
  Update framework code after new ART options.

8 years agoDon\'t use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 15:59:42 +0000 (15:59 +0000)]
Don\'t use framework permission strings for netd permissions.
am: f1f45fe012

* commit 'f1f45fe012ddbd516e797099994c400a1cac8581':
  Don't use framework permission strings for netd permissions.

8 years agoMerge "Update framework code after new ART options."
Nicolas Geoffray [Thu, 19 Nov 2015 15:54:21 +0000 (15:54 +0000)]
Merge "Update framework code after new ART options."
am: d7d2817ade

* commit 'd7d2817ade8459a8f6872ff814d3208613502858':
  Update framework code after new ART options.

8 years agoMerge "Update framework code after new ART options."
Nicolas Geoffray [Thu, 19 Nov 2015 15:48:01 +0000 (15:48 +0000)]
Merge "Update framework code after new ART options."

8 years agoMerge "Apply VectorDrawable density scaling before applying theme"
Alan Viverette [Thu, 19 Nov 2015 14:50:40 +0000 (14:50 +0000)]
Merge "Apply VectorDrawable density scaling before applying theme"

8 years agoApply VectorDrawable density scaling before applying theme
Alan Viverette [Thu, 19 Nov 2015 14:47:09 +0000 (09:47 -0500)]
Apply VectorDrawable density scaling before applying theme

Refactors density handling to look more similar to GradientDrawable's
implementation, which should make things easier to maintain. We no
longer update density directly in updateStateFromTypedArray, instead
handling it in applyTheme() and inflate().

Lazily calculates local density-dependent dimensions and invalidates
when the constant state density changes, which should ensure a random
call to applyTheme() will still result in the correct intrinsic
dimensions.

Change-Id: I726878a6cd75d38a550637e3e7a7b6bc68bcaf6d

8 years agoAdd Work Contacts Directory APIs
Ricky Wai [Mon, 9 Nov 2015 18:20:57 +0000 (18:20 +0000)]
Add Work Contacts Directory APIs

Add Work Contacts Directory APIs, so primary profile application can get work directory info.

Bug: 25761127

Change-Id: I0bce6f8153d32e7da883911c5b0af182745e9d40

8 years agoUpdate framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 13:48:35 +0000 (13:48 +0000)]
Update framework code after new ART options.

Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59