Commit Graph

11537 Commits

Author SHA1 Message Date
Geoffrey Pitsch
b65450e135 Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am: 0d5c1490ce

Change-Id: Iff93082f1d38becfc498fd7ba0d417ed88955c25
2017-07-26 14:39:17 +00:00
Geoffrey Pitsch
0d5c1490ce Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev 2017-07-26 14:31:23 +00:00
Geoffrey Pitsch
1556495e28 Remove ability to downgrade importance of existing channel.
Test: runtest systemui-notification
Bug: 63920384
Change-Id: Ic9f5c50c3d2a36ccd4ba9686dad1eb415b559215
2017-07-26 10:27:02 -04:00
Christine Franks
cb03504d21 Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
am: 4ac942f140

Change-Id: I3d09e6fe436ae1ced8f9ed88e919f1d9bb5e52db
2017-07-26 00:16:28 +00:00
Christine Franks
4ac942f140 Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev 2017-07-26 00:07:14 +00:00
Christine Franks
f66a377785 DO NOT MERGE - Remove RetailDemoModeServiceInternal
Bug: 62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e
2017-07-25 21:16:29 +00:00
Selim Cinek
001956c626 Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am: 8650c7c0f1

Change-Id: I4dd8cfab340c595181f52659d552bc03f51818ec
2017-07-23 12:57:20 +00:00
TreeHugger Robot
8650c7c0f1 Merge "Removing contents hidden string for public notifications" into oc-dr1-dev 2017-07-23 12:51:43 +00:00
Selim Cinek
499c20f25d Removing contents hidden string for public notifications
We're now only showing the notification header instead of the
repetitive contents hidden string. On Aod, we're still showing
a string however, since without it, it looked too empty.

Test: manual, set sensitive setting on lockscreen, observe notifications
Change-Id: If2bb66b9b3b366715aa68087e5c35cf1cdff3693
Fixes: 63741232
2017-07-20 14:16:13 -07:00
Geoffrey Pitsch
4158c7a215 Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
am: 3ca605e28c

Change-Id: Ic4e1a653f38cf9e93f8262e55865a907dfbd2c83
2017-07-20 15:41:14 +00:00
Geoffrey Pitsch
3ca605e28c Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev 2017-07-20 15:33:41 +00:00
Selim Cinek
825719bb92 Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev
am: 8ffa981686

Change-Id: I20fbb857570c0e7bb02659b9026b0800d5939bc2
2017-07-19 23:47:16 +00:00
Selim Cinek
8ffa981686 Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev 2017-07-19 23:41:44 +00:00
Selim Cinek
15733d1f85 Reducing bitmap sizes in notifications
Bitmap sizes could be arbitrary large when they were sent
over to the system. We're now reducing them to reasonable
sizes.s

Also fixed that notification bitmaps were not put into
ashmem anymore since it got lost in a refactor.

Test: code inspection
Bug: 62319200
Merged-In: I87db7656e749666b9eab1f67fd497f155c407e18
Change-Id: I87db7656e749666b9eab1f67fd497f155c407e18
2017-07-19 18:06:09 +00:00
Romain Guy
5a92a6e074 Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev
am: e00bcc0fef

Change-Id: I300fa41c30c64f22c47d164f3b6d6d698e34302f
2017-07-19 01:00:13 +00:00
Romain Guy
cecbe073bb Put generated/compiled graphics code in getCodeCacheDir()
A refactoring introduced a slight regression that caused compiled
shaders to be cached in the wrong directory.

Bug: 63813783
Test: Manual
Change-Id: I863e584ff1df4cda9242c64afd643a899023ee1c
2017-07-18 22:48:59 +00:00
Lucas Dupin
11e0e33756 Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev
am: bc907cf9a8

Change-Id: Ib5533fdbcfba36fc1ed82e0089cc681e73a02f05
2017-07-18 20:24:53 +00:00
TreeHugger Robot
bc907cf9a8 Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev 2017-07-18 20:08:58 +00:00
Geoffrey Pitsch
68c9741cb2 Allow apps to downgrade importance in createNotificationChannel
Only takes effect if the user has not changed any fields.
Some tangential cleanup of the test file:
 - Rename member variable "uid" to "mUid"
 - Use correct PKG instead of "test_pkg"
 - Some character limit fixes

Test: runtest systemui-notification
Fixes: 63755460
Change-Id: I3c2df0c03ec333f320ac7a0fe90792f1b0ef02ce
2017-07-18 13:58:51 -04:00
Neil Fuller
34aca9e2c5 Merge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5
am: 444616f4bf

Change-Id: I5f4265d738aa3669a0c7acb8df49b454a3e27f9c
2017-07-17 22:40:28 +00:00
Neil Fuller
444616f4bf Merge "Remove TODOs that are not needed" am: 0f9842304a
am: 5c2cfc51c5

Change-Id: Ia585380cb88829bf55171092389b77081d941f17
2017-07-17 22:32:38 +00:00
Neil Fuller
5c2cfc51c5 Merge "Remove TODOs that are not needed"
am: 0f9842304a

Change-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79
2017-07-17 22:24:36 +00:00
Neil Fuller
a9f0eeb36f Remove TODOs that are not needed
Remove TODOs to add classes to the system API that are not needed
(since they are used by a platform-only app).

Bug: 31008728
Test: make droid
Change-Id: I0d75686ddeae929e9d87c5ca8703a609a1450d76
Merged-In: I600e7b08853b86b27463193411cf85207ae09ce8
2017-07-17 17:57:11 +01:00
Lucas Dupin
42acf6009a Don't recycle bitmaps we don't own
WallpaperColors#fromBitmap should only recycle the bitmaps
created by itself.

Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Fixes: 63758291
Change-Id: I1710bf7118b6ae871442f9606f95ac9c9dbb7d24
2017-07-17 16:35:29 +00:00
Jason Monk
a6ef052f59 Merge "Fix crash in monodroid apps" into oc-dr1-dev
am: 3d80a73350

Change-Id: If80299af64fac8138e4cf9b681ebed13e09b8ccf
2017-07-14 19:35:18 +00:00
Jason Monk
0b06d4e0ba Fix crash in monodroid apps
Don't getApplicationContext if we already have an application.

Test: launch a monodroid app
Change-Id: I0c1558463053de3db0f1cd4693088e7c639ce5fa
Fixes: 63666480
2017-07-14 13:23:58 -04:00
Julia Reynolds
e58e833819 Merge "Fix system crash" into oc-dr1-dev
am: 5a0958ed0b

Change-Id: Icd087a48c50670bc5a59c34a13ecb3df5d5529e2
2017-07-14 13:49:13 +00:00
Julia Reynolds
0f17000fb3 Fix system crash
Change-Id: I47d6d79682bfe907544f9282c26e350576618ce2
Fixes: 63474899
Test: runtest systemui-notification
2017-07-13 11:35:46 -04:00
Christine Franks
b128d9cd77 Merge "Support demo mode and demo users" into oc-dr1-dev
am: 2f87ca1637

Change-Id: I429ce9d2c273c9b093e2f9fe789d126a0b95f198
2017-07-11 14:47:35 +00:00
Christine Franks
361b825c0d Support demo mode and demo users
Bug: 62712426
Test: run cts -m CtsDevicePolicyManagerTestCases -t \
com.android.cts.devicepolicy.DeviceOwnerTest#testCreateAndManageEphemeralUser
and
run cts -m CtsDevicePolicyManagerTestCases -t \
com.android.cts.devicepolicy.DeviceOwnerTest# \
testCreateAndManageEphemeralUserFailsWithoutSplitSystemUser
and
runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest \
frameworks-services
Change-Id: I77a71a994fe0f4f1f8c5df7c4ccf493aafa8fefe
2017-07-10 17:49:42 -07:00
Julia Reynolds
8d4cd22ffb Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
am: c65071d625

Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424
2017-07-10 17:06:23 +00:00
Lucas Dupin
a9682937b6 Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
am: 8b94ef697e

Change-Id: Ic63c9dc9963846afd2ab854630d56512059609d9
2017-07-10 16:58:46 +00:00
Julia Reynolds
c65071d625 Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev 2017-07-10 16:55:01 +00:00
Julia Reynolds
6ad0aecf99 Limit the number of notis an app can enqueue
In addition to the number they can post. Also decrease
the number of posts per second to 5, but allow finished
progress notifications through.

Fixes: 63173849
Fixes: 63167456
Test: runtests systemui-notification & simultaneously
downloading 5 files.
Change-Id: I0c8ea35b3d9d38b000ea5fe383515e1d5a26bac7
2017-07-10 09:42:24 -04:00
Lucas Dupin
4bd24f36c5 Add theme style flag to WallpaperColors
Theme colors should always be the same in sysui and launcher.
We're now sharing a hint HINT_SUPPORTS_DARK_THEME, to make sure
we're never out of sync.

Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Fixes: 63140091
Change-Id: Ibd196f540d77269df377804b0f4d4d0d20820067
2017-07-07 14:36:45 -07:00
Julia Reynolds
6b734d0478 Merge "Allow setup apps to colorize notifications." into oc-dr1-dev
am: e4101089bb

Change-Id: I14f8f499ac62ed47d40ca9b2a7bff0c79120dcd7
2017-07-07 19:31:57 +00:00
Julia Reynolds
e4101089bb Merge "Allow setup apps to colorize notifications." into oc-dr1-dev 2017-07-07 19:24:37 +00:00
Andrew Solovay
967bae0cf6 Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am: 1cdf4244f4
am: bc4dc42887

Change-Id: I96a162db5fc80ab578a206ca13bd193a33762a64
2017-07-07 19:15:29 +00:00
Andrew Solovay
465810c895 Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am: 1cdf4244f4

Change-Id: I1c25c17f1f73e4006e3b0fa9479d5b0563c6be98
2017-07-07 19:09:39 +00:00
Andrew Solovay
bc4dc42887 Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am: 1cdf4244f4

Change-Id: I295298edcd7f26df46edb71924fa63038a381619
2017-07-07 19:08:56 +00:00
Julia Reynolds
d71c5a9426 Allow setup apps to colorize notifications.
Fixes: 63147379
Test: runtest systemui-notification, core tests
Change-Id: I2077a9fd563826d978d0dc01be89dd0bbc09eebf
2017-07-07 17:22:43 +00:00
Lucas Dupin
1446809f30 Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I54e5d27f52d197ae2512ab7216e12e11cf5c8c30
2017-07-07 02:42:35 +00:00
TreeHugger Robot
b1ab0ff21e Merge "Hide all color hints references" into oc-dr1-dev 2017-07-07 00:12:08 +00:00
Neil Fuller
78526c3341 Merge "Add dumpsys support to RulesManagerService" am: 348a1d635d am: 06c2f8e346
am: 61ea5e6c8f

Change-Id: If516a2daeeb38490add4570bbd937801906b356d
2017-07-03 09:53:28 +00:00
Neil Fuller
61ea5e6c8f Merge "Add dumpsys support to RulesManagerService" am: 348a1d635d
am: 06c2f8e346

Change-Id: I23f60a0c235780afd551cbe5f546918317bfe098
2017-07-03 09:47:03 +00:00
Neil Fuller
06c2f8e346 Merge "Add dumpsys support to RulesManagerService"
am: 348a1d635d

Change-Id: Ib1b44ce174b625f2223dff72081ccfc7b2a9b390
2017-07-03 09:41:47 +00:00
Neil Fuller
87b1128ddc Add dumpsys support to RulesManagerService
Override the dump method so RuleManagerService can dump its state
into logs. Crude argument support has been added for dumping
specific fields in an easy to process way (for test scripts to use).

Tested with:
make -j30 FrameworksServicesTests
adb install -r -g \
  "out/target/product/angler/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"

Test: See above.
Test: Manual; adb shell dumpsys timezone [-format_state piscotz]
Bug: 31008728
Change-Id: I0ad83aa245232ed0b983ceacd8accfb876824d6f
2017-06-30 18:18:07 +01:00
Christopher Tate
0d95a0eefa Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
am: 2de66f7be1

Change-Id: Id453b9477272c8d10738a06626411dfda58cea74
2017-06-29 22:34:22 +00:00
TreeHugger Robot
2de66f7be1 Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev 2017-06-29 22:26:34 +00:00
Santos Cordon
99eac47966 Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
am: 67143a8cfc

Change-Id: I9a65c8a9c33ffe4a982d090966654f4e93690c3b
2017-06-29 21:31:53 +00:00