Commit Graph

11918 Commits

Author SHA1 Message Date
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
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
David Stevens
78a6c4c926 Merge "Handle showWhenLocked on secondary displays" 2017-09-19 18:13:46 +00:00
Wale Ogunwale
0568aed2af ActivityOptions.set/getLaunchStackId() be gone!
Removed ActivityOptions.set/getLaunchStackId() and replacement
ActivityOptions.set/getWindowingMode() and set/getActivityType()

Test: Existing tests pass.
Test: go/wm-smoke
Bug: 64146578
Change-Id: Ifc1c35f7b13c335cdf1a1694208e9fe0aea0c1fa
2017-09-19 10:36:52 -07:00
Santos Cordon
ac49b2c040 Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev am: f7771c9f77
am: a17abfef56

Change-Id: Idf89c63e91b0677799b3b48aff3f19fd08792998
2017-09-19 00:55:43 +00:00
Santos Cordon
a17abfef56 Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
am: f7771c9f77

Change-Id: Ib569f91269f75ee288dc515505f9a46b0dbe61c9
2017-09-19 00:47:52 +00:00
Santos Cordon
01a4ea59f3 Fix missing RequiredPermission annotation.
Bug: 64360244
Test: Manual compilation.
Change-Id: I7091e366baf5bcaf29945e9a0e2a283309e54452
2017-09-18 18:39:55 +00:00
TreeHugger Robot
b2a0009cce Merge "Added WindowConfigurationProto and friends" 2017-09-18 16:06:22 +00:00
Charles He
2fe81c0605 Merge "Status bar: correctly register disable flags" 2017-09-18 14:49:02 +00:00
Wale Ogunwale
0d5609ba8c Added WindowConfigurationProto and friends
Also added WindowContainerProto and ConfigurationContainerProto
Will be used by cts tests in upcoming CLs that replace StackId APIs.

Test: adb shell dumpsys window --proto
Bug: 64146578
Change-Id: Id6ca2a93e3d15ac696ab54cb241870e973985967
2017-09-18 07:23:23 -07:00
Charles He
ede390982c Status bar: correctly register disable flags
StatusBarManager has two sets of disable flags to control the visibility
of various UI components. These flags are registered in DisableRecord.
This CL fixes a bug where clearing one set of disable flags causes both
sets of flags to be cleared.

Bug: 65813446
Test: runtest systemui
Change-Id: I95948fd2464402b6f2fd123dba34b64aeeb80c90
2017-09-18 14:31:17 +01:00
Selim Cinek
56867b7072 Merge "Increased the text size for colorized notifications" into oc-mr1-dev am: dd3b6c83c6
am: f83e81117a

Change-Id: Ideb598d0c28ce8bb0b84913e4683dda453d522a6
2017-09-15 21:34:25 +00:00
Selim Cinek
f83e81117a Merge "Increased the text size for colorized notifications" into oc-mr1-dev
am: dd3b6c83c6

Change-Id: Ifd1e83f3400bd870d087c1a248bb74b305aa313f
2017-09-15 21:26:46 +00:00
Selim Cinek
dd3b6c83c6 Merge "Increased the text size for colorized notifications" into oc-mr1-dev 2017-09-15 21:20:44 +00:00
Selim Cinek
299b3302ef Increased the text size for colorized notifications
Increased the text sizes a bit to make them more prominent.

Test: add colorized notifications of all styles
Change-Id: Ie22053edcb0297e7c3ee0c43b29cdd0e7b6a4516
Fixes: 	35925915
2017-09-15 11:08:30 -07:00
Jiyong Park
215df9c284 Merge "Merge "Fix missing null checking" into oc-mr1-dev am: 93d436f4bc" into oc-mr1-dev-plus-aosp
am: 2089f92625

Change-Id: Id44a81a44df376ebcaa9efd229b78328d8eaa5ac
2017-09-15 13:56:46 +00:00
Kevin Hufnagle
8f601e7da0 Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16 am: 677b6f5a7b
am: 86ca0d2ad4

Change-Id: I9d616a940eac9b25cb1b7b5d630dd6c4401594ae
2017-09-15 11:33:20 +00:00
Lucas Dupin
ea35a29229 Merge "Show big text on AoD" into oc-mr1-dev am: a4996f241f
am: c86252c1dc

Change-Id: I51d691cd2cec04cd9c0b979a87914e9b4cde49ce
2017-09-15 11:21:33 +00:00
Jiyong Park
8aefdab7c3 Merge "Fix missing null checking" into oc-mr1-dev
am: 93d436f4bc

Change-Id: Ib0a68cdf2d45141895191b7e2250ab0505c5a7ea
2017-09-15 02:47:46 +00:00
Kevin Hufnagle
86ca0d2ad4 Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16
am: 677b6f5a7b

Change-Id: Ib225f08dd4d53479adab6df0f3559d09fe09ab21
2017-09-15 02:24:50 +00:00
Jiyong Park
93d436f4bc Merge "Fix missing null checking" into oc-mr1-dev 2017-09-15 02:19:19 +00:00
Kevin Hufnagle
677b6f5a7b Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df
am: 91fb9b2a16

Change-Id: Ib5ff83e4ce6c5a172db8f483387ebb6a8a97ae55
2017-09-15 01:01:15 +00:00
Kevin Hufnagle
91fb9b2a16 Merge "docs: updated link on RemoteInput page" into oc-dev
am: 6087b990df

Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
2017-09-15 00:42:20 +00:00
Jiyong Park
b16d32bc78 Merge "vendor apk is unbundled" into oc-mr1-dev am: a26750e757
am: 6cc659cd9e

Change-Id: If89b2e232e78b78e2b33dd2d529e2718903b8c22
2017-09-15 00:13:49 +00:00
Jiyong Park
63495c2796 Fix missing null checking
Bug: 65666724
Test: build

Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480
2017-09-15 08:07:41 +09:00