Commit Graph

301953 Commits

Author SHA1 Message Date
TreeHugger Robot
a8d123de10 Merge "Support for WindowContainer controllers and listeners" 2017-01-06 20:07:31 +00:00
TreeHugger Robot
deafcf02c2 Merge changes If135544e,Ic595b01f
* changes:
  bools: fix use_lock_pattern_drawable javadoc.
  widget: Adding support for custom LockPatternView.
2017-01-06 20:06:02 +00:00
Andrew Sapperstein
fcf6cc3062 Add temperature config for high temp warning.
am: 1cac83218c

Change-Id: I1aedaf0714e0f020f6e062bac716841ec472db2a
2017-01-06 20:04:30 +00:00
Ruchi Kandoi
3a1ff62e5a nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 12:02:33 -08:00
Fan Zhang
d2d3e2cce8 Move category refresh call into a separeate method.
By default we no longer refresh category with each setTileEnabled.
Instead app will call update after all setTileEnabled are called.

This saves a lot of async task execution when Settings app starts

Bug: 34103984
Test: RunSettingsRoboTest (no regresssion)
Change-Id: I71ddcdb3e1fc0df6cacb53583a4f7e8ae8d675f1
2017-01-06 11:44:38 -08:00
TreeHugger Robot
677e297537 Merge changes from topics 'List parent profile custom ringtones from managed profile', 'Add/delete custom ringtones from storage'
* changes:
  [RingtoneManager] Option for cursor to list parent sounds
  [RingtoneManager] API to delete custom ringtones
  [RingtoneManager] API to add custom ringtones
2017-01-06 19:35:59 +00:00
Stan Iliev
6337f4fb27 Create a new jank test to measure HW layer resize performance
Write a jank test that is animating height and width of a View
backed by a HW layer.

Test: built angler-userdebug and ran UiBench jank tests.
Change-Id: I69eccb73b6fb887549506c80590892665051ee2f
2017-01-06 14:28:56 -05:00
Ruben Brunk
1ad4a2d32e Fix unexpected VR mode exit on package update.
Bug: 33809651
Change-Id: Ifbaf705e74eda2bde3e4b2d9092360a1c658e660
2017-01-06 11:23:49 -08:00
Ruchi Kandoi
bc1d78606c Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f am: c1db6c05d0
am: bbc00c877f

Change-Id: I1a84b4ce4215136f30ce7936581ee80230c8abbc
2017-01-06 19:19:51 +00:00
Makoto Onuki
9fd9019cf1 Revert "ShortcutManager: Floating shortcuts shouldn't have target activities."
This reverts commit 106ff7a0a1.

Test: All the unit tests (ShortcutManagerTest1*) CtsShortcutHostTestCases and CtsShortcutManagerTestCases

Change-Id: Iadce2b3785cbf728daa60c4e2ff103e516d85896
2017-01-06 11:17:08 -08:00
Ruchi Kandoi
bbc00c877f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f
am: c1db6c05d0

Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
2017-01-06 19:10:22 +00:00
Andrii Kulian
45a61fe529 Make sure cleanup is always done when task is removed
When Stack#removeImmediately() was called it also recursively
called Task#removeImmediately(), which remove tasks from stack.
This lead to Task#mStack reference being nullified, but task
dim layer user was still registered in DimLayerController.
Therefore there was a crash when dim layer animation occured.

This CL moves most of the logic from Task#removeIfPossible() to
Task#removeImmediately() to make sure that cleanup is performed
every time when task is removed.

Change-Id: Id8d72dc8c66b9eeefbf5c918cf0a0df4ea027fde
Fixes: 34052466
Test: bit FrameworksServicesTests:com.android.server.wm.TaskStackTests
Test: #testStackRemoveImmediately
2017-01-06 11:06:19 -08:00
Dan Albert
98e462df7d Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.

Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I74e988be8f60f8728a0bfa7360091cbd9f5b1186
2017-01-06 11:04:14 -08:00
Ruchi Kandoi
c1db6c05d0 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b
am: 388980d88f

Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
am: cc4203221b

Change-Id: I4add3ce1cf3170aff887865302964b4425094692
2017-01-06 18:58:17 +00:00
Andrew Sapperstein
429cafb85e Update CHAR LIMIT for notification body.
Test: is comment change
Bug: 34097363
Change-Id: I8ae19c3b5108c9c2f00614cd5d32cee06082a052
2017-01-06 18:57:41 +00:00
Andrii Kulian
7fc22812ce Fix selecting focused stack with secondary displays
When the last activity finishes in the stack we're looking for other
stacks and making it focused. However we weren't doing that if the
stack was on a secondary display, so the focused stack records were
not updated in stack supervisor.

Now we're looking for other stacks on the same display first. If there
is nothing focusable left - shifting focus to next focusable display.

Test: android.server.cts.ActivityManagerDisplayTests
Test: #testStackFocusSwitchOnDisplayRemoved
Test: #testStackFocusSwitchOnStackEmptied
Change-Id: Ifbb893e12cbe9c4928b949a86fc8bc027de181e4
2017-01-06 10:51:01 -08:00
Ruchi Kandoi
cc4203221b Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." 2017-01-06 18:49:45 +00:00
Ruchi Kandoi
104e0b4399 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 18:48:51 +00:00
Yorke Lee
92b504cb9e Merge "Fix for onTaskRemovalStarted callback being sent incorrectly" 2017-01-06 18:32:48 +00:00
Andrew Sapperstein
1cac83218c Add temperature config for high temp warning.
Adds an integer resource (config_warningTemperature) that is used
to display the high temp warning. If it is set to less than 0,
the value from HardwarePropertiesManager#getDeviceTemperatures(
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN,
HardwarePropertiesManager.TEMPERATURE_THROTTLING) is used instead.

Test: manual
Bug: 30995038
Change-Id: I05aa1b5930c6c151ebac439dfd5c00b3305dc46d
(cherry picked from commit 7518471ab6)
2017-01-06 18:28:10 +00:00
Andrew Sapperstein
e7dc98733d Merge "Add temperature config for high temp warning." 2017-01-06 18:27:26 +00:00
Alain Vongsouvanh
30f532febb Merge "bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542 am: f36beac956" into nyc-mr2-dev-plus-aosp
am: 66602c8885

Change-Id: Icf9930719382684fac096923e1fa490225d4ee55
2017-01-06 18:25:18 +00:00
Alain Vongsouvanh
ac93028895 bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542 am: f36beac956
am: 0870987700

Change-Id: Ia2160b62213efc326ee7ca0cc0fcbd377a2dd374
2017-01-06 18:25:09 +00:00
Alain Vongsouvanh
6152b39deb bools: fix use_lock_pattern_drawable javadoc.
Change-Id: If135544edb499ee64117bf81c6e3d0eebbfcff00
2017-01-06 10:23:56 -08:00
Alain Vongsouvanh
d5988d31ca bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542 am: e51a76861c
am: b4e0b5c5bd  -s ours

Change-Id: Ie9f5642bd4ca3ca7fdf4bd3663e20beef90c0094
2017-01-06 18:23:47 +00:00
Alain Vongsouvanh
88a2a61f09 widget: Adding support for custom LockPatternView.
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
  * lockscreen_notselected: asset to display when a cell has not been selected.
  * lockscreen_selected: asset to display when a cell has been selected.

BUG: 33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
2017-01-06 10:22:45 -08:00
Android Build Merger (Role)
66602c8885 Merge "bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542 am: f36beac956" into nyc-mr2-dev-plus-aosp 2017-01-06 17:50:01 +00:00
Alain Vongsouvanh
0870987700 bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542
am: f36beac956

Change-Id: I4df384dd641d623d0a7fb100661dbc6232c4014b
2017-01-06 17:49:11 +00:00
Alain Vongsouvanh
b4e0b5c5bd bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542
am: e51a76861c

Change-Id: I202ece102111012cee7c3cca980b9256f84fc0ee
2017-01-06 17:48:37 +00:00
Wei Wang
202b862be0 Merge "Move ProcessCpuTracker.init into CpuTracker thread" 2017-01-06 17:43:52 +00:00
Alain Vongsouvanh
e51a76861c bools: fix use_lock_pattern_drawable javadoc.
am: c4046b5542

Change-Id: I381d005e73d6100e619dabf607b27cb18a969d7f
2017-01-06 17:41:43 +00:00
Alain Vongsouvanh
f36beac956 bools: fix use_lock_pattern_drawable javadoc.
am: c4046b5542

Change-Id: Ifd50a1780a232d3902e5a232c2b3445aeb6db178
2017-01-06 17:41:37 +00:00
TreeHugger Robot
424bce6ec6 Merge "Use internal volume controller and status bar." 2017-01-06 17:39:08 +00:00
Robin Lee
bee6422d7c Don't move-to-front overlays for unresumed tasks
If we do move those tasks to the front, it will annoy the user of the
device because clearly that's not the activity they were using at the
time (otherwise it would have been resumed already)

This is a more generous check than the existing "if !top.visible" which
only prevented the new overlay activity from bringing the task to the
front if it was unresumed AND not visible on the screen.

Now it just has to be unresumed.

Bug: 31001762
Change-Id: I4576aaafa141ef5297f9c18935b747693a80f0fd
2017-01-06 17:12:55 +00:00
Wale Ogunwale
26c0dfed7a Support for WindowContainer controllers and listeners
- WindowContainerController class allows a component outside window manager
to create a window container and communicate directly with it to make
changes. For example, the ActivityRecord class in activity manager uses the
AppWindowContainerController class to create and communicate with
AppWindowToken window container class which is its counterpart on the window
manager side.
- WindowContainerListener interface allows a component outside WM to get
notified of changes to a window container. For example, the ActivityRecord
class in AM implements the AppWindowContainerListener interface to get
notified of changes to the AppWindowToken container.

Bug: 30060889
Test: Existing tests pass and manual testing.
Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerControllerTests
Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerTests
Change-Id: I2896bfa46a80b227052528c7da8cf4e56beab4bc
2017-01-06 09:11:02 -08:00
skuhne@google.com
7e85eb0278 Apps which do not support density cannot be resized
This is to prevent apps which do not support density
(so essentially pre-Doughnut) from being resized and / or
windowed in free form mode.

These apps are rendered into a smaller sized buffer and
then scaled onto the screen. Using freeform window mode with
these apps uncovered many different problems.

Bug: 33843467
Test: Pre-N as well as Pre-Doughnut applications are presented
properly in free form mode. (Pre-Doughnut cannot be windowed /
resized, many M apps can).
Change-Id: I3c0eb3681486dc85ace15955432d79200743bce3
2017-01-06 08:39:41 -08:00
Julia Reynolds
bb983d20d2 Use internal volume controller and status bar.
Remove code that let these components be replaced by external
processes.

Bug: 33006669
Bug: 34106436
Test: manual. reboot device, play music, change volume,
view notifications
Change-Id: I458f11537ab9db6f23735487513815553004613f
2017-01-06 15:59:45 +00:00
Julia Reynolds
f35e3976e3 Allow apps to enable notification badging.
Test: runtest systemui-notification
Change-Id: Ia16d671d864d1eee902652e31f023e30dc6b7387
2017-01-06 10:57:51 -05:00
Jorim Jaggi
8a28aa54c7 Fix message for screen unpinning
Test: Pin app, touch home button
Change-Id: Ic7cf5c9151977a5517dc259802a1489cc6cdf519
Fixes: 34052116
2017-01-06 07:57:47 -08:00
TreeHugger Robot
496777de7d Merge "Implement image draw functions in SkiaCanvasProxy" 2017-01-06 15:56:28 +00:00
TreeHugger Robot
0a7b66b0bb Merge "Create a global registry for system message IDs" 2017-01-06 15:54:58 +00:00
Chris Wren
5e6c0ffd3e Create a global registry for system message IDs
Port all system UI notifications to use the registry.  Retain stable
integer IDs where they exist. Assign new stable IDs where resource IDs
were previously used.

Using "message" rather than "notification" since we may eventually
want to include dialogs and toasts.

Bug: 32584866
Bug: 30995038
Test: runtest systemui
Change-Id: Iec4d7cebbd88683e339ada29a279315222699942
2017-01-06 09:22:02 -05:00
Tony Mak
aedb707aa3 Merge "Allow current profiles to disable keyguard" 2017-01-06 12:06:33 +00:00
Narayan Kamath
55ab172acf Merge "PackageManagerService: Enable package parse cache." 2017-01-06 11:56:57 +00:00
Alain Vongsouvanh
53cb4c5269 Merge "resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 414f8fbdbb
am: 962cde0f56

Change-Id: I28628a83513f33a8ca56aede612f0e956d6bbbc5
2017-01-06 10:56:52 +00:00
Alain Vongsouvanh
0955148318 resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp am: 5549258eea
am: 9da42f05bf

Change-Id: Iabc903c27a6841bc20eed4c820a92ea0c54f9939
2017-01-06 10:55:44 +00:00
Alain Vongsouvanh
962cde0f56 Merge "resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am: 414f8fbdbb

Change-Id: I7dab2a9548fe2285caf94ca1d108df616bddd27a
2017-01-06 10:47:52 +00:00
Alain Vongsouvanh
9da42f05bf resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp
am: 5549258eea

Change-Id: Ic77c99e37c9e5ff019adf5693ea40d9e5d80c562
2017-01-06 10:47:48 +00:00
TreeHugger Robot
414f8fbdbb Merge "resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2017-01-06 10:40:36 +00:00