OSDN Git Service
Jiaquan He [Thu, 29 Dec 2016 00:13:14 +0000 (00:13 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:12:48 +0000 (00:12 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
TreeHugger Robot [Wed, 28 Dec 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
Andrew Solovay [Wed, 28 Dec 2016 20:32:03 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
Andrew Solovay [Wed, 28 Dec 2016 20:31:02 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
Andrew Solovay [Wed, 28 Dec 2016 20:24:34 +0000 (20:24 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am:
61dad4b2fc
Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
Andrew Solovay [Wed, 28 Dec 2016 20:24:30 +0000 (20:24 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am:
40ba793b33
Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
Andrew Solovay [Wed, 28 Dec 2016 20:16:26 +0000 (20:16 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
Jiaquan He [Wed, 28 Dec 2016 19:12:23 +0000 (19:12 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
Jorim Jaggi [Wed, 28 Dec 2016 17:01:18 +0000 (17:01 +0000)]
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
Jorim Jaggi [Wed, 14 Dec 2016 19:02:39 +0000 (11:02 -0800)]
Change screen pinning back to old gesture
This makes the code a bit more complicated, but allows apps to
receive long-press back again and also makes the mode harder
to exit for toddlers.
Test: Without TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Test: With TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Merged-In: Icd7347aa9c60af00fdb0b3991baabb730552d097
Change-Id: Icd7347aa9c60af00fdb0b3991baabb730552d097
Fixes:
32440409
Jiaquan He [Tue, 27 Dec 2016 19:05:44 +0000 (11:05 -0800)]
Resue TaskView information.
In this commit we calculate all the TaskView information we need
during initialization, so that we don't need to calculate again
unless any configuration is changed.
Bug:
32101881
Change-Id: I433688d0a05c69064d0da5268b61340cecdbfe74
Adrian Roos [Tue, 27 Dec 2016 23:36:56 +0000 (23:36 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
Adrian Roos [Tue, 27 Dec 2016 23:20:43 +0000 (23:20 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
Jiaquan He [Fri, 23 Dec 2016 00:47:59 +0000 (16:47 -0800)]
Check split screen properly.
This commit detacts split screen by checking whether there's
a docked task instead of multi window mode.
Bug:
33847223
Bug:
32101881
Change-Id: I23ee11e57ded7c5e81d51cfbfea05500a879945c
TreeHugger Robot [Tue, 27 Dec 2016 19:08:55 +0000 (19:08 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
Selim Cinek [Tue, 27 Dec 2016 11:06:35 +0000 (11:06 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode."
This reverts commit
84980c7a93e93e7134c0198212e222e11eb5ccbd.
Bug:
33895226
Bug:
30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
Adrian Roos [Tue, 27 Dec 2016 18:12:13 +0000 (10:12 -0800)]
Keyguard: Don't lock on SIM removed during shutdown
Fixes a glitch where the SIM is considered removed because
we turn off the radio during shutdown.
Change-Id: Id783114f557b87051b833ea84cecc862f910c6ca
Fixes:
33788000
Lorenzo Colitti [Fri, 23 Dec 2016 04:54:50 +0000 (13:54 +0900)]
Don't loop forever on zero-length ICMPv6 ND options.
Bug:
33828433
Change-Id: Ie1905167126c8c8f3896eaa5e36cd006ca354e99
Santos Cordon [Thu, 22 Dec 2016 23:49:16 +0000 (23:49 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Tue, 20 Sep 2016 22:50:35 +0000 (15:50 -0700)]
Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.
Bug:
30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
TreeHugger Robot [Thu, 22 Dec 2016 21:03:00 +0000 (21:03 +0000)]
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
Pankaj Kanwar [Thu, 22 Dec 2016 20:41:54 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
Daniel Nishi [Thu, 22 Dec 2016 19:06:51 +0000 (11:06 -0800)]
Fix a bug where the package stats query timeout may crash.
This adds a null-check to verify that we got real data before
trying to use it and increases the timeout time to reduce the
likelihood of timing out.
Test: FrameworkServicesTests
Bug:
33836034
Change-Id: Ia1ad4aba05c5c4fb8688fc9fc94df344f736e396
pkanwar [Thu, 22 Dec 2016 19:12:02 +0000 (11:12 -0800)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug:
31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da
Tom O'Neill [Thu, 22 Dec 2016 18:09:48 +0000 (18:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024
am:
f035e8b411
Change-Id: I0795fffc9f7f79f14038cfb6386bbe308b879db5
Tom O'Neill [Thu, 22 Dec 2016 18:04:44 +0000 (18:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e
am:
3b7d90c024
Change-Id: I46c1bf565b04175c8c97c9faeceed55bda41dbde
Tom O'Neill [Thu, 22 Dec 2016 17:59:47 +0000 (17:59 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f
am:
2da05d0f9e
Change-Id: I8c94a06f5fa722312436484609bafcb0585d6d18
Pankaj Kanwar [Thu, 22 Dec 2016 17:59:08 +0000 (17:59 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev
Tom O'Neill [Thu, 22 Dec 2016 17:54:44 +0000 (17:54 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6
am:
7cec76de0f
Change-Id: I9168d45717c26e71bb356dd7304276e23c519bd9
Tom O'Neill [Thu, 22 Dec 2016 17:44:46 +0000 (17:44 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51
am:
56098f81b6
Change-Id: I14fcacaede569580c8ca8e5bbbebb408ddcce76a
Tom O'Neill [Thu, 22 Dec 2016 17:39:18 +0000 (17:39 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc
am:
1ac8affd51
Change-Id: I965c900e266a9189c595612cef6ddac839498949
Tom O'Neill [Thu, 22 Dec 2016 17:34:11 +0000 (17:34 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66
am:
d82f8a67fc
Change-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86
Tom O'Neill [Thu, 22 Dec 2016 17:29:05 +0000 (17:29 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2
am:
1f458fdc66
Change-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc
Tom O'Neill [Thu, 22 Dec 2016 17:23:39 +0000 (17:23 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344
am:
d28eef0cc2
Change-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d
Tom O'Neill [Thu, 22 Dec 2016 17:19:10 +0000 (17:19 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b
am:
1684e5f344
Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e
Tom O'Neill [Thu, 22 Dec 2016 17:14:05 +0000 (17:14 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516
am:
0a8978f04b
Change-Id: I693665a57465ec57f946fad57cda9ce48389408f
Tom O'Neill [Thu, 22 Dec 2016 17:09:09 +0000 (17:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872
am:
3380a77516
Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423
Tom O'Neill [Thu, 22 Dec 2016 17:04:07 +0000 (17:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e
am:
d417e54872
Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db
Tom O'Neill [Thu, 22 Dec 2016 16:58:33 +0000 (16:58 +0000)]
Fix exploit where can hide the fact that a location was mocked
am:
a206a0f17e
Change-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4
TreeHugger Robot [Thu, 22 Dec 2016 16:57:10 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 22 Dec 2016 08:00:05 +0000 (08:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 22 Dec 2016 03:50:32 +0000 (19:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id563dc4a6227745978c8999d577b0970c5c1103f
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Dec 2016 03:41:35 +0000 (19:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I292c850e85d1d11be974bc80ddd0ecd7a66ca557
Auto-generated-cl: translation import
pkanwar [Sun, 18 Dec 2016 04:16:48 +0000 (20:16 -0800)]
DO NOT MERGE: Add API to indicate carrier networks.
Bug:
31003437
Change-Id: I3e3989256588f509c45e50374b8b7168589d6c5d
Hugo Benichi [Thu, 22 Dec 2016 00:49:11 +0000 (09:49 +0900)]
NetworkNotificationManager: remove spammy log
Test: build, flashed, booted phone.
Bug:
32198726
Change-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5
Adrian Roos [Wed, 21 Dec 2016 19:56:38 +0000 (19:56 +0000)]
Merge "DirectReply: Close if touching outside status bar" into nyc-mr2-dev
Daniel Nishi [Wed, 21 Dec 2016 18:37:25 +0000 (18:37 +0000)]
Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev
TreeHugger Robot [Wed, 21 Dec 2016 18:09:45 +0000 (18:09 +0000)]
Merge "DO NOT MERGE - Disabled swiping in Grid-based Recents." into nyc-mr2-dev
Allen Hair [Thu, 22 Sep 2016 16:58:06 +0000 (09:58 -0700)]
Enable multi-dex for coverage builds to fix breakage
Test: m PRODUCT-bullhead-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I6a324cbd0dc078ad2903345a069385d9f0d179ff
(cherry picked from commit
aeaee4c5fe9a71949ddd701f2590559819bfe072)
TreeHugger Robot [Wed, 21 Dec 2016 03:35:41 +0000 (03:35 +0000)]
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev
Manu Cornet [Wed, 21 Dec 2016 03:01:41 +0000 (19:01 -0800)]
2D Recents: use a slightly darker scrim background
Bug:
32101881
Test: Checked recents layout on local sw600dp device
Change-Id: Ic5ae1c1c805896a4cd8d6c3473fa2c693e94d304
TreeHugger Robot [Wed, 21 Dec 2016 02:14:51 +0000 (02:14 +0000)]
Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev
* changes:
Augment diskstats dumpsys to have categorization and apps.
Add a file collector to the platform.
TreeHugger Robot [Wed, 21 Dec 2016 02:14:51 +0000 (02:14 +0000)]
Merge "Add an app size collector." into nyc-mr2-dev
Jiaquan He [Mon, 19 Dec 2016 19:20:31 +0000 (11:20 -0800)]
DO NOT MERGE - Disabled swiping in Grid-based Recents.
Bug:
32101881
Change-Id: I45a806a6b1fc387b2c560a8f2228ad83e4068d7c
(cherry picked from commit
7e09146f1330c3ebe774f29f49d94bf290a1be7f)
Manu Cornet [Tue, 20 Dec 2016 17:33:45 +0000 (09:33 -0800)]
DO NOT MERGE - Delete the separate grid recents activity and related code
This was the first attempt at implementing grid-based Recents.
The new implementation doesn't use a separate activity and reuses a lot
more code.
Bug:
32101881
Test: Checked Recents behavior on local sw600dp device
Change-Id: Ic3535fc49f3f5448d6002d354678b633f122f57d
Manu Cornet [Wed, 21 Dec 2016 01:17:51 +0000 (17:17 -0800)]
2D recents: show all close buttons right away
Bug:
32101881
Test: Checked recents layout on local sw600dp device.
Change-Id: Ib9b40cdc3fdb912315d52d3b47cbcd32fec9842f
Brad Ebinger [Wed, 21 Dec 2016 01:29:07 +0000 (01:29 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 23:29:35 +0000 (23:29 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 22:57:16 +0000 (22:57 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev
Brad Ebinger [Mon, 12 Dec 2016 22:57:37 +0000 (14:57 -0800)]
Adds custom call forwarding block while roaming carrier config key
Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.
Test: Manual
Bug:
30458052
Merged-In: I3149a565b0fd631d69ab0c0f27be509237b80177
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177
TreeHugger Robot [Tue, 20 Dec 2016 22:10:00 +0000 (22:10 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 21:50:13 +0000 (21:50 +0000)]
Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev
Xiaohui Chen [Tue, 20 Dec 2016 21:44:22 +0000 (21:44 +0000)]
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
Daniel Nishi [Tue, 13 Dec 2016 18:38:42 +0000 (10:38 -0800)]
Augment diskstats dumpsys to have categorization and apps.
This adds a new service which opportunistically saves the
file system categorization information and the app sizes. This
information is fetched during a diskstats dumpsys call from a file
stored on the disk. This allows us to keep the dumpsys running quickly
while adding information which is costly to calculate.
Bug:
32207207
Test: System server instrumentation tests
Change-Id: Id59e84b9ad38a9debf3e46e5133ef06f7353829d
Daniel Nishi [Mon, 12 Dec 2016 23:16:00 +0000 (15:16 -0800)]
Add an app size collector.
The app collector gets a list of app sizes for packages on a given
storage volume. This information will be exposed as part of an
expansion of the diskstats dumpsys.
When the collector runs, it sets up a handler on a BackgroundThread
which asks the PackageManager for the package sizes for all apps and
all users. The call for the information is blocked using a
CompletableFuture until the call times out or until we've received
all of the package stats. After the stats are all obtained, the
future completes.
Bug:
32207207
Test: System server instrumentation tests
Change-Id: I3a27dc4410effb12ae33894b561c02a60322f7b0
Daniel Nishi [Thu, 10 Nov 2016 22:10:15 +0000 (14:10 -0800)]
Add a file collector to the platform.
The file collector takes in a file path and recursively
classifies and provides the amount of storage provided by
each classification. This information can be surfaced in
Settings or to fulfill storage telemetry calculations.
Bug:
32207207
Test: System server instrumentation tests
Change-Id: Iff03260859cd4bbd11e7d60b1825115aad540d48
Marie Janssen [Tue, 20 Dec 2016 19:21:12 +0000 (11:21 -0800)]
Bluetooth: persist state when turning on from BLE
Test: in BLE_ON state, turn to full on, reboot phone
Bug:
33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310
Andrew Sapperstein [Fri, 16 Dec 2016 02:10:34 +0000 (18:10 -0800)]
Add flags to send package name for feedback.
Bug:
32189956
Test: make RunSettingsLibRoboTests
Change-Id: I0bd40fdf60b4f3ee21afad6e3f7dc3e4e87212f0
(cherry picked from commit
c05c740d606a4a0c4418f34f6cfbc06fbda8d201)
Adrian Roos [Mon, 19 Dec 2016 22:26:51 +0000 (14:26 -0800)]
Ambient Display: Fix race with coloring and redaction
Fixes a bug that could result in a notification being colored on
ambient display when redaction is enabled.
Only the showing layout (either redacted or regular) was be set to
dark. If the showing layout changed after the darkness changed, the
newly showing layout was not properly darkened.
Change-Id: I0930ebe8007634ee92e104573294b5c27f1bad82
Fixes:
33429653
Test: Enable redacted notificationsn on lockscreen, enter ambient, verify that notifications are gray.
Manu Cornet [Tue, 20 Dec 2016 16:29:33 +0000 (08:29 -0800)]
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
Bug:
32101881
Test: Checked Recents layout/behavior on local sw600dp device
Change-Id: I40be7dbaf8bc017b4c7c449f9bca657817107ceb
Tim Murray [Tue, 20 Dec 2016 19:47:24 +0000 (11:47 -0800)]
Fix incorrect FIFO cgroup assignment.
bug
33745094
Change-Id: I46eefc8ea6f17ca3795f4743692ddfea36d5db0f
Philipp Weiß [Tue, 20 Dec 2016 19:52:04 +0000 (19:52 +0000)]
Merge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev
phweiss [Wed, 14 Dec 2016 20:37:48 +0000 (21:37 +0100)]
DO NOT MERGE Show notification when network logging is enabled
A notification is shown after network logging is enabled
and after the next three reboots that are at least one day apart.
Clicking it sends an intent to quick settings to shown its device monitoring
dialog.
Cherry-picked from master.
Bug:
29748723
Bug:
33126577
(cherry-picked from commit
a0cb251ca6a8ea8df17ff8089573bc50f2f1849f)
Test: Manual, CTS-Verifier tests will be added later
Change-Id: I2bf517bd27ab23ad3f66270602dbf062efab8cbb
Philipp Weiß [Tue, 20 Dec 2016 17:57:34 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev
Tony Mak [Wed, 2 Nov 2016 10:26:45 +0000 (10:26 +0000)]
DO NOT MERGE: Cross profile candidate should be considered
Bug:
32547783
Fixed the regression introduced in
8e2d9d1d9050e93b15c54e992698325c7d4aa57c
Test: Manual test - Open a map link in work calendar, personal map is shown as an option.
Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
(cherry picked from commit
9f2c93663c2de84f958eebef96a98458ebaf51a9)
phweiss [Fri, 2 Dec 2016 13:31:04 +0000 (14:31 +0100)]
DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
If a device owner is active, the layout is changed from a
standard AlertDialog with only one string to a custom dialog
that includes information on Device Owners, and VPN and Network Logging,
if enabled.
Cherry-picked from master and modified to not rely on changes that are not in
N:
A change in master renamed some variables in QSFooter.createDialog() and made
them final, this change is also included here.
The owner's organization name cannot be set in N.
In the case of active Device Owner and active VPN, there was a specialized
string for this in N. This string was now replaced by using the simpler
Device Owner string + an own entry for VPN in the new layout.
Some imports had to be included that were already there on master.
The dimen-tag throws an error message on floats during build, replaced by an
item-tag.
BUG:
29748723
BUG:
33126622
Test: Manual, CTS-Verifier tests will be added later
(cherry picked from commit
9e450e12330d4cfe7843613c79f1c3671d08305f)
Change-Id: I2bfca9d9d02a42d9c3b17683625eda29e9369666
Hugo Benichi [Tue, 20 Dec 2016 00:57:43 +0000 (09:57 +0900)]
DO NOT MERGE Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.
Test: verified that the test fails when reintroducing the format String
bug.
Bug:
33737715
Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a
TreeHugger Robot [Tue, 20 Dec 2016 04:58:51 +0000 (04:58 +0000)]
Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev
* changes:
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
DO NOT MERGE Fix malformed log statement.
Paul Stewart [Mon, 19 Dec 2016 16:45:32 +0000 (08:45 -0800)]
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
Commit
fb2609d3eee1c7a4dda889c000f32183a044978a added a string
format which caused an exception. On top of the fixes to this
from
e1406167186c2cabe683b3c1511ad6733e9106c9, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.
Bug:
33737715
Test: Build and run SUW
(cherry picked from commit
835cb49639fc7cb75819564fa15f2f5a0bd5dee2)
Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36
Joe LaPenna [Mon, 19 Dec 2016 18:31:14 +0000 (10:31 -0800)]
DO NOT MERGE Fix malformed log statement.
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f
BUG:
33746580
Test: built, triggered notification, no crash.
(cherry picked from commit
e1406167186c2cabe683b3c1511ad6733e9106c9)
Change-Id: I50594ad865e6f95abc5c67c58af604ef2aa88f9b
Chris Tate [Tue, 20 Dec 2016 01:01:52 +0000 (01:01 +0000)]
Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev
Xiaohui Chen [Tue, 20 Dec 2016 00:33:16 +0000 (16:33 -0800)]
sysui: update sw900dp navbar sizes
Bug:
32516898
Change-Id: I3e1a2855fa3cb2f538bf87df3d48ac3dcfc4c67a
Adrian Roos [Tue, 20 Dec 2016 00:17:50 +0000 (16:17 -0800)]
DirectReply: Close if touching outside status bar
Close direct reply when a touch outside the status bar window
happens. This is especially important with HUNs, where we allow
the touch to go through to the underlying window.
Change-Id: I12b9cbd5c699b86bcf1f56723a2f0ac5de7e5a42
Test: Receive SMS while unlocked, click Reply on heads-up notification, click in between notification and IME. Verify direct reply closes.
Fixes:
32022071
Christopher Tate [Mon, 19 Dec 2016 22:38:44 +0000 (14:38 -0800)]
Migrate system+lock wallpaper to lock-only when setting live wp
If the static imagery is shared between system+lock, preserve the lock
presentation when setting a different system-surface live wallpaper. If
the caller knows it wants to achieve system+lock display of the new live
wallpaper, it follows up setWallpaperComponent() with an explicit clear
of the lock wallpaper state.
Previously, setting a new system live wallpaper would necessarily override
a desired static lock image in the case of system+lock shared imagery.
Now it doesn't.
Bug
32664317
Change-Id: I7ef2cded534f9e6e91899db4c37bd24efaf09fee
TreeHugger Robot [Mon, 19 Dec 2016 20:59:12 +0000 (20:59 +0000)]
Merge "Start sensor service in a seperate thread" into nyc-mr2-dev
Mark Lu [Mon, 19 Dec 2016 20:28:59 +0000 (20:28 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am:
cbfb58c9d7
am:
70fa908fb2
Change-Id: I1eab802afe75f847555baa8964030a1bb994107a
Mark Lu [Mon, 19 Dec 2016 20:27:52 +0000 (20:27 +0000)]
docs: remove implicit intent from bindService and startService am:
94ebbe0e58
am:
d7c29565ba
Change-Id: I44109d60ff26725daf6ebbce50bac9a7068146fe
Mark Lu [Mon, 19 Dec 2016 20:22:00 +0000 (20:22 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
am:
cbfb58c9d7
Change-Id: If12008d4e9fe1883c6c4f21e6e6736045b325182
Mark Lu [Mon, 19 Dec 2016 20:21:57 +0000 (20:21 +0000)]
docs: remove implicit intent from bindService and startService
am:
94ebbe0e58
Change-Id: Iaf24452f3456703c917a2a574ff218c9eac854bd
Mark Lu [Mon, 19 Dec 2016 20:21:21 +0000 (20:21 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am:
5f05256106
am:
9c834b1241
Change-Id: I3288982f953f36ae08a36ca324edb6937633bd18
Mark Lu [Mon, 19 Dec 2016 20:16:15 +0000 (20:16 +0000)]
docs: update Paint.setTextSize() to indicate pixel units
am:
5f05256106
Change-Id: I9709ea36fe7657c8a06abe1c58760b30112e0e63
Mark Lu [Mon, 19 Dec 2016 20:13:15 +0000 (20:13 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
Brad Ebinger [Mon, 19 Dec 2016 19:53:00 +0000 (19:53 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
Charles Mendis [Mon, 19 Dec 2016 19:11:47 +0000 (19:11 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
am:
a586b546c3
Change-Id: I32b15e3ab326700434f488aad7f6e8f05bfa153e
Michael Kwan [Mon, 19 Dec 2016 19:11:45 +0000 (19:11 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss.
am:
67639a5f67
Change-Id: I8ceab83a3a8287bdf8d2a7ff88427404543755c9
Charles Mendis [Mon, 19 Dec 2016 19:05:49 +0000 (19:05 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
Marie Janssen [Mon, 19 Dec 2016 17:58:38 +0000 (17:58 +0000)]
Merge changes I546d7abc,I32163278 into nyc-mr2-dev
* changes:
Bluetooth: fix issues re-enabling after crash
Bluetooth: log message improvements
Philipp Weiß [Mon, 19 Dec 2016 17:57:13 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev
Daniel Sandler [Mon, 19 Dec 2016 16:44:09 +0000 (16:44 +0000)]
Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev