Commit Graph

11941 Commits

Author SHA1 Message Date
George Mount
085ef4ed9a Merge "Fix Transition test failure." into oc-mr1-dev am: dbd11d6c8b
am: 8e8e3eff08

Change-Id: Ifbffc328d5d356f77d668deb7104d7d73fc28bf2
2017-10-02 21:37:16 +00:00
George Mount
8e8e3eff08 Merge "Fix Transition test failure." into oc-mr1-dev
am: dbd11d6c8b

Change-Id: I5ae4bde02a4ee2a6d053529ebed0b6aa3dc596c5
2017-10-02 21:23:15 +00:00
TreeHugger Robot
9748940395 Merge "Update javadoc of {set, get}OrganizationName to clearly specify that it is available for PO since N and DO since O." 2017-10-02 16:59:20 +00:00
Wen ZHANG
2be4cfcc51 Update javadoc of {set, get}OrganizationName to clearly specify that it
is available for PO since N and DO since O.

Test: Change to Javadoc only

Change-Id: Icc54fd8c9f188207f49d623795b17b835fc9b92d
2017-10-02 15:17:38 +00:00
George Mount
3884b03b98 Fix Transition test failure.
Bug: 67049319

TransitionUtils was returning null when the View wasn't attached,
but Visibility transitions can do that intentionally. This CL
temporarily adds detached views to the view hierarchy as part of
an overlay while creating the hardware bitmap representation.

Test: ran transition CTS tests
Change-Id: Ie335619953653dce0224514f0d5c9c8eb00ee1a9
2017-09-29 15:03:47 -07:00
Felipe Leme
d296eeeb47 Merge "Fixed warning on getWebDomain()" into oc-mr1-dev am: 256c2822f5
am: 8eec0c723d

Change-Id: I415492d049ccff8d0d83eb9679c5b95f1d8dc0a1
2017-09-29 19:16:37 +00:00
Felipe Leme
8eec0c723d Merge "Fixed warning on getWebDomain()" into oc-mr1-dev
am: 256c2822f5

Change-Id: I4279400bd5a5ab441961942782054d5e810235c4
2017-09-29 18:40:34 +00:00
Felipe Leme
6221903454 Fixed warning on getWebDomain()
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML.
Bug: 66963249

Change-Id: If063961f41f297da1ed67e73616972f455edc117
2017-09-29 08:58:47 -07:00
Svet Ganov
0ba9304231 Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev am: 4de7ab5cb1
am: b5ac756015

Change-Id: I425ff226b355597b52b0e2f871cbc419b069f1ee
2017-09-29 01:23:15 +00:00
Svet Ganov
b5ac756015 Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev
am: 4de7ab5cb1

Change-Id: I2e50c036193ba30a203fcfe2f46ea9f94b5992ee
2017-09-29 00:17:57 +00:00
TreeHugger Robot
4de7ab5cb1 Merge "Don't clobber shared libs when updating app info" into oc-mr1-dev 2017-09-28 22:22:56 +00:00
Wale Ogunwale
d562d535af Merge changes from topic "stack-gone"
* changes:
  HOME_STACK_ID, ASSISTANT_STACK_ID, and RECENTS_STACK_ID be gone!
  Ability to getOrCreateStack by windowingMode/activityType in AM.
2017-09-28 17:37:57 +00:00
Doris Liu
3c5622cc5d Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev am: a3acf73c3e
am: 732b3c4159

Change-Id: Icbc3a7878d001ec62c15e9ef116bb1dc084c87ac
2017-09-28 04:57:55 +00:00
Wale Ogunwale
68278568de HOME_STACK_ID, ASSISTANT_STACK_ID, and RECENTS_STACK_ID be gone!
Replaced usages with ACTIVITY_TYPE_HOME, ACTIVITY_TYPE_ASSISTANT
and ACTIVITY_TYPE_RECENTS.

Test: go/wm-smoke
Test: Existing tests pass.
Bug: 64146578
Change-Id: I62c55c99df86dba8c9ba9d9986049de1b1083234
2017-09-27 21:08:10 -07:00
Doris Liu
732b3c4159 Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev
am: a3acf73c3e

Change-Id: I1aa48a41fbbf453f9a3d0ce794f81103a5ed1e35
2017-09-28 02:48:26 +00:00
Wale Ogunwale
04a05ac34a Ability to getOrCreateStack by windowingMode/activityType in AM.
Another step away from using static stack ids for things.

Test: Existing tests pass.
Test: go/wm-smoke
Bug: 64146578
Change-Id: Iac05046c96d10e5b26d444172341f2ecf9efe3ee
2017-09-27 19:43:21 -07:00
Doris Liu
a3acf73c3e Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev 2017-09-28 02:33:48 +00:00
Doris Liu
d4c5ab8b8c Associate RenderNodes created for hw bitmap w/ views
In transition animations, in order to capture the content of a view
or a drawable in a hw bitmap, a RenderNode needs to be created. The
RenderNode was previously setup with no owning view. As a result,
in cases where RenderNode animations are triggered by the draw calls
in displaylist recording, these animations would fail for lack of a
view to animate on.

This CL ensures that when RenderNodes are created for the purpose of
populating content in a hw bitmap in transitions, there's always a
view associated with each RenderNode.

BUG: 65160121
Test: Force to repro crash by changing press state during hw bitmap
creation, which triggers a ripple animation that led to the
otherwise timing dependent and hard to repro crash.

Change-Id: I2b4ba95cad25a94d50b3904e775606f737e960e3
2017-09-27 16:53:05 -07:00
Svet Ganov
6ce92394ad Don't clobber shared libs when updating app info
If we update a package without restart or if an installed
package is a target of a resource overlay we update the app
info on the applicaiton side which is then used to update
the class loader and the resources the app is loading from.
To do that we send over an app info instance for the package
which was partially populated and missing the shared lib
entries resulting in apps not finding resources and classes
from the lib.

Test: manual

bug:62685545

Change-Id: Ib40b430c85a1e5d74f270a4326497ea3bd832215
2017-09-27 16:04:14 -07:00
TreeHugger Robot
c014a7f1fb Merge "Simplifying writeToParcel for various actions" 2017-09-27 19:18:18 +00:00
Sunny Goyal
5b15392c9a Simplifying writeToParcel for various actions
> Using helper methods when writing and reading typed objects
> Moving the tag write outside the action, as it is read outside
  the action as well
> Removing usused tags

Test: am instrument -w -e class android.widget.RemoteViewsTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 65574108
Change-Id: Iaf51cae6ef9f82b70dc1f19c2f019af40c4424a2
2017-09-27 08:52:30 -07:00
Neil Fuller
36eaefa9cc Merge "Be more explicit about users" 2017-09-27 09:30:28 +00:00
Kweku Adams
2cdb576a5a Merge "incidentd: creating PolicyProto for NotificationManager" 2017-09-26 18:38:35 +00:00
Charles He
e66a5bcac1 Merge "StatusBar: add DISABLE2_SYSTEM_ICONS flag" 2017-09-26 15:32:35 +00:00
Kweku Adams
5ec78cd58f incidentd: creating PolicyProto for NotificationManager
The previous code saved a String in the proto like
"NotificationManager.Policy[priorityCategories=PRIORITY_CATEGORY_REMINDERS,PRIORITY_CATEGORY_EVENTS,PRIORITY_CATEGORY_MESSAGES,PRIORITY_CATEGORY_CALLS,PRIORITY_CATEGORY_REPEAT_CALLERS,priorityCallSenders=PRIORITY_SENDERS_STARRED,priorityMessageSenders=PRIORITY_SENDERS_STARRED,suppressedVisualEffects=SUPPRESSED_EFFECT_SCREEN_OFF]".
This unfortunately would mean that the String would have to be parsed on
the server-side, which kinda defeats the purpose of migrating to protos,
so I made a proto for this :)

BUG: 65750824
Test: flash device and check incident.proto output, comparing it to the previous output
Change-Id: I87607dc7b72ce3519132da23167b4bdce3b7ef4c
2017-09-25 16:33:44 -07:00
Charles He
6a79b0dff1 StatusBar: add DISABLE2_SYSTEM_ICONS flag
Add a StatusBarManager flag to control the visibility of system icons
such as connectivity info, battery, etc. Note that the clock is
controlled separately through DISABLE_CLOCK.

Also note that this flag differs from DISABLE_SYSTEM_INFO, which
controls the system icons and the clock as a whole, but only works for
the collapsed status bar (CollapsedStatusBarFragment).

Bug: 65813398
Test: runtest systemui
Test: manual, by using a modified version of TestDPC and
      DevicePolicyManagerService

Change-Id: Icb61c7bb1a625edd818be7a66d7f15c3e812237b
2017-09-25 21:29:27 +01:00
Adrian Roos
f2ebc40286 Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev am: 73c93f02f7
am: 392a9b5c1d

Change-Id: Ifeb044d767b03c799fa028e6efc967b88fae7b53
2017-09-25 18:47:59 +00:00
Adrian Roos
392a9b5c1d Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev
am: 73c93f02f7

Change-Id: I647bfc52892b305eb59f446812e142b609172bd4
2017-09-25 18:38:23 +00:00
Adrian Roos
73c93f02f7 Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev 2017-09-25 18:33:01 +00:00
Adrian Roos
2adc263ce9 FRP: Add config flag for disabling credential FRP
Bug: 65258606
Test: Verify FRP still works when not disabled
Change-Id: I78e308b6eaba73c794615b1eebdbfacb334ae72f
2017-09-25 13:32:48 +02:00
Wale Ogunwale
9dcf94656d Moved ActivityDisplay to its own class file.
Clean-up before the next windowing mode refactor.
Also:
- Change the return type of ActivityStack.shouldBeVisible from int
to boolean since it is now binary.
- Removed ActivityStack.mRecentTasks. Changed call points to use
the reference in ActivityStackSuperior.
- Removed ActivityStack.mStacks and ActivityStackSuperior.mStack.
Changed call points to use reference in ActivityDisplay.
- Removed a few unused methods and variables.

Fixes: 66452053
Test: Existing tests pass.
Change-Id: Id9f4c668cdfc638820ad1777db85ac4d2619b85a
2017-09-23 08:28:55 -07:00
Neil Fuller
1281f39f86 Be more explicit about users
Be more explicit about users executing processes in the time
zone updates code.The code was already running everything as the
system user but now that's more explicit / by design.

To service unit tests:
make -j30 FrameworksServicesTests
adb install -r -g "${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
  "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Bug: 64111659
Test: Unit tests: See above
Test: Manual testing installing updates as secondary device user
Test: PTS: run pts -m PtsTimeZoneTestCases
Change-Id: Idb754f3e1aa3830ba1ada8ef5740f9f7340f03d5
2017-09-22 16:14:54 +01:00
Neil Fuller
c94d9d6bc4 Merge "Move non-public intent out of the public namespace" into oc-mr1-dev am: 3f1ba67f1e
am: ba0f43de1f

Change-Id: I77143a608c7823dddd33a06d77936f7404a46f3d
2017-09-22 10:44:03 +00:00
Neil Fuller
ba0f43de1f Merge "Move non-public intent out of the public namespace" into oc-mr1-dev
am: 3f1ba67f1e

Change-Id: Ie93db5b1770cc05ba476b97b829a8f8e1925f673
2017-09-22 10:31:43 +00:00
TreeHugger Robot
3f1ba67f1e Merge "Move non-public intent out of the public namespace" into oc-mr1-dev 2017-09-22 10:24:43 +00:00
Winson Chung
7393cfe326 Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev am: 66f2d56556
am: 58c6e603b2

Change-Id: Ic58e8010f52e1665b21fc99b90c4cffd1374b5db
2017-09-21 17:00:58 +00:00
Winson Chung
58c6e603b2 Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev
am: 66f2d56556

Change-Id: I9145bce7131e695a696e50b3e46e5c4a30a8e669
2017-09-21 16:46:20 +00:00
Winson Chung
66f2d56556 Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev 2017-09-21 16:38:16 +00:00
Neil Fuller
f24394f1dc Move non-public intent out of the public namespace
Move a non-public intent out of the public android.intent.action
namespace. The new name is
com.android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK.

Bug: 65991376
Test: CTS: run -m CtsIntentSignatureTestCases
Test: PTS: run -m PtsTimeZoneTestCases
Change-Id: I619b564aa6262108ab2d1c95ba6e288efd8cc9f2
2017-09-21 12:56:19 +00:00
Selim Cinek
5a873bc122 Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev am: 204346c277
am: 98507bebf0

Change-Id: Ibb867d26b6580adcbf53632def2bc16563362d5a
2017-09-21 04:45:56 +00:00
Selim Cinek
98507bebf0 Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
am: 204346c277

Change-Id: I0723bc15fb651881ee9c42fd59c2a94abc761c42
2017-09-21 01:38:09 +00:00
TreeHugger Robot
204346c277 Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev 2017-09-21 01:29:53 +00:00
Selim Cinek
a6ee4bd1bc Revert "Increased the text size for colorized notifications"
This reverts commit 299b3302ef.

Change-Id: Id887bd37f8f7b0c1ff48c339c9d59491f65cae84
Bug: 35925915
Fixes: 66067974
2017-09-20 23:03:12 +00:00
David Stevens
85cac19a66 Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am: 9282193c84

Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94
2017-09-20 00:18:26 +00:00
TreeHugger Robot
9f2f7a50ae Merge "Delete unused interface IAM.swapDockedAndFullscreenStack()" 2017-09-20 00:18:07 +00:00
TreeHugger Robot
d4f7c5bc19 Merge "ActivityOptions.set/getLaunchStackId() be gone!" 2017-09-20 00:09:09 +00:00
David Stevens
9282193c84 Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev 2017-09-20 00:09:04 +00:00
Winson Chung
85d3c8a8f8 Ensure profile-specific PiP notification is shown.
- Pipe through user id when an activity is pinned, to ensure we show the
  right notification with the correct profile badge that launches into the
  correct profile's PiP settings.

Bug: 65417722
Test: Enter PiP for work profile app, ensure that it shows the notification
      for that profile, and launches the profile-specific PiP settings.

Change-Id: I62b8e1b23cb81bfc60c93f452cf950ab06cbf32d
2017-09-19 14:06:01 -07:00
Wale Ogunwale
d5efc1fd0d Delete unused interface IAM.swapDockedAndFullscreenStack()
Deleting so I don't have to convert to the new windowing model later.

Test: Existing test pass.
Change-Id: I6adbe11348e3f01f4e32d8b404b6399d5eff7152
2017-09-19 13:07:39 -07:00
David Stevens
67c036b1ba Handle showWhenLocked on secondary displays
The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.

Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug: 64994006
Merged-In: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
2017-09-19 18:15:43 +00:00