OSDN Git Service
Daniel Nishi [Wed, 21 Dec 2016 18:44:14 +0000 (18:44 +0000)]
Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev
am:
fbe70a3e93
Change-Id: I05bf62c7d4b5d0a98b30ed8b8748d6afe919133f
Allen Hair [Wed, 21 Dec 2016 18:44:08 +0000 (18:44 +0000)]
Enable multi-dex for coverage builds to fix breakage
am:
77a51d1274
Change-Id: Ife18d443d4c6a7ffcdb183cee3f7317efafbab38
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
Jiaquan He [Wed, 21 Dec 2016 18:18:39 +0000 (18:18 +0000)]
Merge "DO NOT MERGE - Disabled swiping in Grid-based Recents." into nyc-mr2-dev
am:
b9606a5d09
Change-Id: I3888fc06f40661f73689a71b3db83a52ccbb7c89
Jiaquan He [Wed, 21 Dec 2016 18:18:34 +0000 (18:18 +0000)]
DO NOT MERGE - Disabled swiping in Grid-based Recents.
am:
620aebabb2
Change-Id: I24914bfe923ec251adff8c931c32398c013ac581
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)
Calin Juravle [Wed, 21 Dec 2016 10:14:42 +0000 (10:14 +0000)]
Merge "Report non-primary dex files loads to PM" am:
f23ea2ca62 am:
78b3889804
am:
9947e79b26
Change-Id: I8ddb7756c0690584343cb026a298bc5f0b8d4e27
Calin Juravle [Wed, 21 Dec 2016 10:09:45 +0000 (10:09 +0000)]
Merge "Report non-primary dex files loads to PM" am:
f23ea2ca62
am:
78b3889804
Change-Id: Iaf17def2729170403fa61ce0e09ced4675a47191
Calin Juravle [Wed, 21 Dec 2016 10:04:39 +0000 (10:04 +0000)]
Merge "Report non-primary dex files loads to PM"
am:
f23ea2ca62
Change-Id: I5eb9f8c8bc7e66c074adb95ad5dfec412cec539c
Calin Juravle [Wed, 21 Dec 2016 09:57:40 +0000 (09:57 +0000)]
Merge "Report non-primary dex files loads to PM"
Manu Cornet [Wed, 21 Dec 2016 03:43:56 +0000 (03:43 +0000)]
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev
am:
09c0fdca7b
Change-Id: Iee06fca34f0b8fed136be45a93359414a5420734
Manu Cornet [Wed, 21 Dec 2016 03:43:49 +0000 (03:43 +0000)]
DO NOT MERGE - Delete the separate grid recents activity and related code
am:
e93f8100a6
Change-Id: I30195b094fe27bec5b78f799942bf004000d9ef2
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
Daniel Nishi [Wed, 21 Dec 2016 02:28:55 +0000 (02:28 +0000)]
Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev
am:
639f95dd13
Change-Id: I3491a1ef5303e8e991eafe3911c882d94d4d3ed5
Daniel Nishi [Wed, 21 Dec 2016 02:23:50 +0000 (02:23 +0000)]
Augment diskstats dumpsys to have categorization and apps.
am:
090b2d9d6c
Change-Id: I2c923293a1baf91b14ab50e25c880bfeb191403d
Daniel Nishi [Wed, 21 Dec 2016 02:23:05 +0000 (02:23 +0000)]
Add a file collector to the platform.
am:
be770dce08
Change-Id: I2b908b6df1ad305207fca596d6c865dfeaecd5c9
Daniel Nishi [Wed, 21 Dec 2016 02:22:18 +0000 (02:22 +0000)]
Merge "Add an app size collector." into nyc-mr2-dev
am:
8fd55702b1
Change-Id: I53fd6c70e49fd724fbe131dea3f485893133bf20
Daniel Nishi [Wed, 21 Dec 2016 02:21:31 +0000 (02:21 +0000)]
Add an app size collector.
am:
c7d9de59bf
Change-Id: I83bdc3b47eda2658d7467b7c298652e39ad3f238
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
Tim Murray [Wed, 21 Dec 2016 02:10:23 +0000 (02:10 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am:
d9ce420d9a am:
a72f5f27d2
am:
4dfe21d668
Change-Id: I3840f68322659336d6737747dd86abcca48fa639
Tim Murray [Wed, 21 Dec 2016 02:05:58 +0000 (02:05 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am:
d9ce420d9a
am:
a72f5f27d2
Change-Id: I172251111ab333e750bc862725a50b7913f20c90
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)
Tim Murray [Wed, 21 Dec 2016 01:57:51 +0000 (01:57 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."
am:
d9ce420d9a
Change-Id: Ib5c5ee81058ded098d16dba1dfd43096bbd91937
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
Treehugger Robot [Wed, 21 Dec 2016 01:47:55 +0000 (01:47 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."
Brad Ebinger [Wed, 21 Dec 2016 01:34:25 +0000 (01:34 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev
am:
5153e46897
Change-Id: I1476d383602745c0e11de916c85618e2640eb24e
Brad Ebinger [Wed, 21 Dec 2016 01:34:11 +0000 (01:34 +0000)]
Adds custom call forwarding block while roaming carrier config key
am:
eab25ae197
Change-Id: Ic638971c4bae7b496e94431ae2c0f35a22261896
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
Amin Shaikh [Wed, 21 Dec 2016 01:19:48 +0000 (01:19 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am:
c1940ef392 am:
380341f6c8
am:
18d7a5e95f
Change-Id: I9e0240a30524436d13c60c3a1251064012c6f7bb
Amin Shaikh [Wed, 21 Dec 2016 01:15:18 +0000 (01:15 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am:
c1940ef392
am:
380341f6c8
Change-Id: If863fcce014adf2b2c0d866dc14ba59732f57520
Amin Shaikh [Wed, 21 Dec 2016 01:10:44 +0000 (01:10 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
am:
c1940ef392
Change-Id: If3d909680cbcda0440807db40761c1a84b2cde97
Treehugger Robot [Wed, 21 Dec 2016 01:00:18 +0000 (01:00 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
Sundeep Ghuman [Wed, 21 Dec 2016 00:56:48 +0000 (00:56 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am:
31a8f712ab am:
6d749fb489
am:
c5443c1d5c
Change-Id: Icbe6a2c873cdbe795092589430b15f10545a3cc2
Sundeep Ghuman [Wed, 21 Dec 2016 00:51:49 +0000 (00:51 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am:
31a8f712ab
am:
6d749fb489
Change-Id: I711dd2b9d142a3a92ed641b08dd944be329e503a
Sundeep Ghuman [Wed, 21 Dec 2016 00:43:15 +0000 (00:43 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
am:
31a8f712ab
Change-Id: Iba52c9ed85a7e35c46b85a9516a81ac5096a6710
Treehugger Robot [Wed, 21 Dec 2016 00:28:47 +0000 (00:28 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
Marie Janssen [Tue, 20 Dec 2016 23:38:31 +0000 (23:38 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
am:
f77ca5fa18
Change-Id: Iee9a1e57f9b6ad0262fa5cedf1fc0daaf9c2fc00
Marie Janssen [Tue, 20 Dec 2016 23:38:26 +0000 (23:38 +0000)]
Bluetooth: persist state when turning on from BLE
am:
fa9bec95a5
Change-Id: I7fa40c657100032e400af8422b29941771b0e91a
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
Amin Shaikh [Tue, 20 Dec 2016 23:28:34 +0000 (15:28 -0800)]
Change fillColor for Wi-Fi badges to #FFFFFF.
Bug:
33778046
Test: make
Change-Id: I0cfc2c6d682a2f13e665563fc1c54fa19324af53
Sundeep Ghuman [Tue, 13 Dec 2016 02:05:10 +0000 (18:05 -0800)]
Create and implement a CacheListener inside WifiNetworkScoreCache.
Bug:
33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38
Andrew Sapperstein [Tue, 20 Dec 2016 23:03:54 +0000 (23:03 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev
am:
72df83d117
Change-Id: I8a4bba81f402372035eaf37bd5d6489f042b52b9
Andrew Sapperstein [Tue, 20 Dec 2016 23:03:26 +0000 (23:03 +0000)]
Add flags to send package name for feedback.
am:
8dc3b870a0
Change-Id: I72a213a36de7459850e3f688569c901c192dcf9a
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
Amin Shaikh [Tue, 20 Dec 2016 22:48:15 +0000 (22:48 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am:
f456ddf3fd am:
a81a4163f5
am:
9209505c85
Change-Id: I4584fa5909f60fa21dec2014c90b3d7dc49a13a9
Amin Shaikh [Tue, 20 Dec 2016 22:39:41 +0000 (22:39 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am:
f456ddf3fd
am:
a81a4163f5
Change-Id: I847b3d07024e025040304f47de88211956d20175
Amin Shaikh [Tue, 20 Dec 2016 22:35:06 +0000 (22:35 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
am:
f456ddf3fd
Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32
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:24:13 +0000 (22:24 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
Tim Murray [Tue, 20 Dec 2016 22:17:35 +0000 (22:17 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
am:
a03c3e74a4
Change-Id: I3f5633da996140cf88d85e5f997d9e41d48dec45
Tim Murray [Tue, 20 Dec 2016 22:17:29 +0000 (22:17 +0000)]
Fix incorrect FIFO cgroup assignment.
am:
2dc4a74806
Change-Id: I21f7c8a27bf5ee162d7b4567b408ab11eed30ae0
TreeHugger Robot [Tue, 20 Dec 2016 22:10:00 +0000 (22:10 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
Tim Murray [Tue, 20 Dec 2016 19:47:24 +0000 (11:47 -0800)]
Fix incorrect FIFO cgroup assignment.
bug
33745094
Test: builds
Change-Id: I46eefc8ea6f17ca3795f4743692ddfea36d5db0f
Manu Cornet [Tue, 20 Dec 2016 21:57:13 +0000 (21:57 +0000)]
Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev
am:
5ef12f244c
Change-Id: Iff1c2fa5c05b891ea478caa2400cbd42f8a1914b
Manu Cornet [Tue, 20 Dec 2016 21:57:08 +0000 (21:57 +0000)]
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
am:
bf8e290376
Change-Id: I7b05418dc2d03da33e862cf67dbcd1d08cb1b899
Xiaohui Chen [Tue, 20 Dec 2016 21:52:46 +0000 (21:52 +0000)]
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
am:
2d6accd7a9
Change-Id: I07ef49f3fd5fa3ab364f5b527c4e21a1c96e6b3d
Xiaohui Chen [Tue, 20 Dec 2016 21:52:41 +0000 (21:52 +0000)]
sysui: update sw900dp navbar sizes
am:
c48f07bc82
Change-Id: Ia9bfece57902625c72eda216464344a40bd25db7
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
Hall Liu [Tue, 20 Dec 2016 21:36:12 +0000 (21:36 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" am:
26e5096364 am:
fc125a319e
am:
57c781417f -s ours
Change-Id: Ic021a41d713aaa4f8a4af6cdcc1560b7b718b6e8
Andre Eisenbach [Tue, 20 Dec 2016 21:35:03 +0000 (21:35 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" am:
8e9551bacf am:
e6164ca72a
am:
bf43955a6b
Change-Id: I2d41410fcdb6824e45027412a7b80e16af797346
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
Hall Liu [Tue, 20 Dec 2016 21:28:12 +0000 (21:28 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" am:
26e5096364
am:
fc125a319e
Change-Id: I305223c2a5499b9fdf2f1f59ddfda40712cd6172
Andre Eisenbach [Tue, 20 Dec 2016 21:27:05 +0000 (21:27 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" am:
8e9551bacf
am:
e6164ca72a
Change-Id: I7c27d09c83daf73817585f2713bd2f05b97cd525
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
Hall Liu [Tue, 20 Dec 2016 21:19:43 +0000 (21:19 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"
am:
26e5096364
Change-Id: I2ce0958075ec3bd2c337993516ad06ffd264d594
Andre Eisenbach [Tue, 20 Dec 2016 21:18:35 +0000 (21:18 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"
am:
8e9551bacf
Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010
Hall Liu [Tue, 20 Dec 2016 21:13:31 +0000 (21:13 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"
Amin Shaikh [Tue, 20 Dec 2016 21:12:55 +0000 (21:12 +0000)]
Merge "Add Wi-Fi quality badge icons." am:
edb8982c31 am:
061d4fff4b
am:
99a19e8116
Change-Id: I68d8c31057da94ce90d4193ef2813646782746fa
Andre Eisenbach [Tue, 20 Dec 2016 21:11:58 +0000 (21:11 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"
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
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)
Alex Klyubin [Tue, 20 Dec 2016 21:05:15 +0000 (21:05 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory" am:
f420b91e26 am:
be81b50b6e
am:
e1bc33228e
Change-Id: I80c703f7784436414263fb86f56b7c85a6da40e7
Amin Shaikh [Tue, 20 Dec 2016 20:53:32 +0000 (20:53 +0000)]
Merge "Add Wi-Fi quality badge icons." am:
edb8982c31
am:
061d4fff4b
Change-Id: I25b230cbc51cd7079d2c73d116c9e4550fc5b02e
Amin Shaikh [Tue, 20 Dec 2016 19:00:34 +0000 (11:00 -0800)]
Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.
Test: make
Bug:
33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Merged-In: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Alex Klyubin [Tue, 20 Dec 2016 20:45:59 +0000 (20:45 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory" am:
f420b91e26
am:
be81b50b6e
Change-Id: I1275903e7fda6bdd9c1012bc7cfb6c42f6b43304
Amin Shaikh [Tue, 20 Dec 2016 20:24:31 +0000 (20:24 +0000)]
Merge "Add Wi-Fi quality badge icons."
am:
edb8982c31
Change-Id: I43d4f52e26eb7514b177d10769d6a5e3fc78f386
Treehugger Robot [Tue, 20 Dec 2016 20:13:59 +0000 (20:13 +0000)]
Merge "Add Wi-Fi quality badge icons."
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 20:01:38 +0000 (20:01 +0000)]
Merge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev
am:
2f42cbcad5
Change-Id: I3464a515734350bbd9b411932b2d6616a7ffcd58
phweiss [Tue, 20 Dec 2016 20:01:33 +0000 (20:01 +0000)]
DO NOT MERGE Show notification when network logging is enabled
am:
923d2cc9d9
Change-Id: Ia5839248361a7d7fbb0c73cdb569ada62a96c286
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
Alex Klyubin [Tue, 20 Dec 2016 18:45:57 +0000 (18:45 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory"
am:
f420b91e26
Change-Id: Ic178cdd9043c171f2f51643212e34b642657abe9
Amin Shaikh [Sat, 17 Dec 2016 04:37:48 +0000 (20:37 -0800)]
Add Wi-Fi quality badge icons.
Test: make
Bug:
33705924
Change-Id: I6ae9fab369151e6c2d3769d7ba4a20103368f0a0
Alex Klyubin [Tue, 20 Dec 2016 18:33:28 +0000 (18:33 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory"
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 18:06:53 +0000 (18:06 +0000)]
Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev
am:
4d3aa8e8ab
Change-Id: Ibba35390892874fc32c0f9cebd50077b617e5e96
phweiss [Tue, 20 Dec 2016 18:06:47 +0000 (18:06 +0000)]
DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
am:
2f512047c2
Change-Id: If56eee8a498435aaa059990eceea9555897e11b9
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 [Tue, 20 Dec 2016 16:57:44 +0000 (16:57 +0000)]
DO NOT MERGE: Cross profile candidate should be considered
am:
ff11122ddc
Change-Id: I9de28d980021579d70d85193b1994ddca042d4fa
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 06:49:08 +0000 (06:49 +0000)]
DO NOT MERGE Stricter NetworkNotificationManagerTest
am:
a865790a5b
Change-Id: I94ea5c6994d181e730ec4f49e98001eb81ed8740
Jeremy Joslin [Tue, 20 Dec 2016 06:37:11 +0000 (06:37 +0000)]
Merge "Implement the request and recommend calls." am:
1e814b3928 am:
b50fdc7faa
am:
949893f5b2
Change-Id: Ibd03bace49bc277a2777c8483da6b4ebfc56d217
Jeremy Joslin [Tue, 20 Dec 2016 06:32:42 +0000 (06:32 +0000)]
Merge "Implement the request and recommend calls." am:
1e814b3928
am:
b50fdc7faa
Change-Id: I81f998b6934715f43797247f411919a4ceee5631
OSDN Git Service
