34110 Commits

Author SHA1 Message Date
TreeHugger Robot
809b79da2f Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev 2017-04-07 00:39:31 +00:00
TreeHugger Robot
ad27aa11b1 Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev 2017-04-07 00:26:34 +00:00
William Luh
5669141382 Merge "Fix injected settings titles not matching a locale change." into oc-dev
am: 1b54760eee

Change-Id: Icdeb7d2e65a0c6061b773765cb6470684d24c5b2
2017-04-07 00:09:34 +00:00
William Luh
1b54760eee Merge "Fix injected settings titles not matching a locale change." into oc-dev 2017-04-07 00:00:44 +00:00
Selim Cinek
daab6f5dbf Fixed the visual appearance on heads-up notifications
Previously the wrong notifications were displayed on top
which could lead to heads-up notifications appearing
halfway.

Test: manual, add 2 heads-up see that the correct one is displayed
Change-Id: I723474e2fe1586e2011a9808f8b8c77a706a6070
Fixes: 36549554
2017-04-06 16:46:34 -07:00
Adrian Roos
2f6bef2c17 Revert "Ignore a broken test until it can be fixed."
This reverts commit 1ee48434efc8129c604b20eae90605b0098f674e.

Change-Id: Ie51d2931a6bafb187902c6ac845066ca70937f2c
2017-04-06 23:06:24 +00:00
Adrian Roos
4c720d2c13 NotiViewWrapper: Fix test that breaks on master
oc-dev allows constructing views with a null context, but
that doesn't work any longer on master.

Bug: 36430936
Change-Id: If069f81d54e3e3b9145ca5187b87888cd6173c0f
Merged-In: If069f81d54e3e3b9145ca5187b87888cd6173c0f
2017-04-06 22:41:50 +00:00
Adrian Roos
0bcaa27ceb AOD: More VisD updates
- Change alpha for clock on AOD2
- Increase header bottom margin on ambient notification

Fixes: 37089014
Bug: 30876804
Test: visual inspection
Change-Id: If7ba1a51fdce3167129e8d8845bcb4a09b22a78d
2017-04-06 15:39:29 -07:00
jackqdyulei
cd98c5dd0f Merge "Add lower case charging string." into oc-dev
am: e263940142

Change-Id: Iad64dbd0b57028e2a5567c81bb86152cdb6d17a4
2017-04-06 22:39:20 +00:00
TreeHugger Robot
e263940142 Merge "Add lower case charging string." into oc-dev 2017-04-06 22:30:49 +00:00
Jason Monk
1b77565a6f Add metrics for nav buttons through KeyButtonView
Doesn't cover home-long-press or overview, but those appear to be
covered by other events.

Test: runtest systemui
Merged-In: I590b52765aaef3c2bf573ce8ab980aa992b1d5b0
Change-Id: I630356245e223a3fb8d4d2fe11be5d498227c0e3
Fixes: 25931698
2017-04-06 15:19:14 -07:00
jackqdyulei
2ffa7db9f0 Merge "Add showChargingMethod in BatteryInfo" into oc-dev
am: 5883a40931

Change-Id: Ic110cc08f3bcd4720210744531703e0be15c9371
2017-04-06 22:17:47 +00:00
TreeHugger Robot
5883a40931 Merge "Add showChargingMethod in BatteryInfo" into oc-dev 2017-04-06 22:06:25 +00:00
William Luh
4c978a302a Fix injected settings titles not matching a locale change.
The injected tiles code currently treats the string metadata value
for the title key in the Activity's manifest as the title itself.
When the language on the device is changed the title remains in the
previous language until a reboot.

This CL will make injected tiles attempt to treat the string metadata
value as a resource variable to get the integer res id and then
properly load the localized title using the res id. To be backwards
compatible, if the res id is 0, we treat the string metadata value as
the title itself (current behavior).

Bug:36470694
Test: make RunSettingsLibRoboTests
Change-Id: I3963534a3a3a27d0455c4ed1ad4fa574b03d67fc
2017-04-06 14:35:51 -07:00
Daniel Nishi
b28c9d6b2d Fix crash when measuring storage.
If we are measuring storage and a volume is removed at the same time,
we can enter a state where we previously verified the volume existed,
but it no longer does. This causes an NPE.

By adding in a null check, we can avoid this crash.

Change-Id: Ib8dbf05102a122bdf4bb6063374e993a1de68425
Fixes: 36689190
Test: None
2017-04-06 14:32:13 -07:00
Philip P. Moltmann
3b817ad66c Merge "Add RecommendationPlugin for Cloud Print" am: b2c75d062d am: 997f7cbabf
am: 41687d06f4

Change-Id: Iddb64b94c03eaf6925d9b4e161ac3c6fdd25a1b8
2017-04-06 20:49:53 +00:00
Philip P. Moltmann
41687d06f4 Merge "Add RecommendationPlugin for Cloud Print" am: b2c75d062d
am: 997f7cbabf

Change-Id: I2b784f49097426922e833f102e1f28fc4dc99357
2017-04-06 20:42:50 +00:00
Sundeep Ghuman
ca53b1fcfe Merge "Update comment on why Keep is needed." into oc-dev
am: 696a83b0c7

Change-Id: I3d55f1601a6a491550f3d22fb66f4331ddad1eef
2017-04-06 20:40:11 +00:00
Kang Li
461959d71f Merge "Add a service to rank apps for ResolverActivity." into oc-dev
am: 5a0ee44ce5

Change-Id: I36f8664480f8741dd4d755cfcc3cfa95d8e3d1ba
2017-04-06 20:37:09 +00:00
TreeHugger Robot
696a83b0c7 Merge "Update comment on why Keep is needed." into oc-dev 2017-04-06 20:32:44 +00:00
TreeHugger Robot
5a0ee44ce5 Merge "Add a service to rank apps for ResolverActivity." into oc-dev 2017-04-06 20:25:47 +00:00
Treehugger Robot
b2c75d062d Merge "Add RecommendationPlugin for Cloud Print" 2017-04-06 20:23:14 +00:00
Jason Monk
79f56babd7 Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev
am: e7ac324c71

Change-Id: If7e422b1a5e7f8b94d4f338412025aa7ca526a09
2017-04-06 20:20:41 +00:00
jackqdyulei
a704efa644 Add lower case charging string.
The previous charging string is "75% - Charging", this cl add lower
case string to make it "75% - charging".

Bug: 36558216
Test: Build
Change-Id: I683843de0b6cbd45bea6a465c7b6d8ee0b7c4f93
2017-04-06 13:18:10 -07:00
jackqdyulei
806f78d988 Add showChargingMethod in BatteryInfo
This toggle is used to decide whether to show charging method.
If it is off, then "Charging over ac" will become "Charging"

Bug: 36558216
Test: RunSettingsLibRoboTests
Change-Id: I98b1f7e7b77d7ce0a7e1aae29e55a33ac79ff0d7
(cherry picked from commit b3c33f63ed120cf4758ec67426bb45291e289fce)
2017-04-06 13:16:58 -07:00
Jason Monk
e7ac324c71 Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev 2017-04-06 19:51:12 +00:00
Jason Monk
e5cff1aa9a Fix theming on brightness dialog
Test: visual
Change-Id: Icee6f98a86e7cfb1e1fe0fb34752e84a7ac9bbda
Fixes: 35960463
2017-04-06 15:18:22 -04:00
Jason Monk
e107202bdc Synchronize on sysui dependency references
Test: make
Change-Id: I913505241bef231dd0b80de7f1b38ed17fa87d69
Fixes: 36779051
2017-04-06 15:14:18 -04:00
Philip P. Moltmann
7e01895e69 Return inet addr for discoverable printers
... by extending the RecommendationInfo to store the inet addresses not
just the count. Thankfully the recommendation plugins already contained
all the printers, not only the count.

Also expose the print service state as system APIs as they will be used
by the default print service.

Bug: 35765644
Test: Ran AddPrinterActivity on network that had printers to discover
Change-Id: I929a177adb75f6848848ba30a472cf0343d2e67e
2017-04-06 11:54:53 -07:00
Jason Monk
25f3db72a6 Make sure to synchronize on references to plugin dependencies
Test: make
Change-Id: I361cb3e4ac4ff5d19e2b0322531c8c614f5b7635
Fixes: 36867744
2017-04-06 14:41:00 -04:00
Jason Monk
ba53d8ae41 Revert "Handle case when snapshot dimensions don't match"
This reverts commit aea6b74e17a0f7b105999adad50dd20eac17df35.
Bug: 36991071
Bug: 36703868
Change-Id: Ie71992144e78a6580bfce17dfdf20396af80eacd
2017-04-06 18:30:11 +00:00
Jason Monk
ab98962251 Merge "Ignore a broken test until it can be fixed." into oc-dev
am: eb93670383

Change-Id: Ie8b63c5dcdf7461a2a5d3baf12c400ec73ea3fb8
2017-04-06 18:24:54 +00:00
Kang Li
38a6da6473 Add a service to rank apps for ResolverActivity.
bug: 36952725,30982298

Test: used PTP before and after this fix.

Change-Id: I5b249af2dd0d9fe32d1e524e8d2675c863e92b5b
2017-04-06 18:08:14 +00:00
TreeHugger Robot
eb93670383 Merge "Ignore a broken test until it can be fixed." into oc-dev 2017-04-06 18:05:00 +00:00
Julia Reynolds
9dbed5d11e Merge "Fix build" into oc-dev
am: 0b47e289c8

Change-Id: Ic1c373a21b2c38cdc6a3c3491bb3080367401519
2017-04-06 17:01:18 +00:00
Julia Reynolds
4740b61553 Fix build
Test: runtest systemui
Change-Id: I94663b45c8f745c9485cdeb898de5a6bc4f85f0b
2017-04-06 16:41:45 +00:00
Julia Reynolds
fafcda882b Merge "Show a link to app settings in notification guts." into oc-dev
am: 0ff1b458ac

Change-Id: I27b70e04b9924c95dbd2f915d27c0e346f2f0a09
2017-04-06 16:06:09 +00:00
Julia Reynolds
0ff1b458ac Merge "Show a link to app settings in notification guts." into oc-dev 2017-04-06 15:55:36 +00:00
Jason Monk
1ee48434ef Ignore a broken test until it can be fixed.
Test: runtest systemui
Bug: 37074875
Change-Id: Id5561a3ded2242c711c2edccefb1647437d6f963
2017-04-06 11:31:19 -04:00
Joseph Pirozzo
6afa6847f8 Merge "Bluetooth Multi Connect" into oc-dev
am: 3c0f1f1aa2

Change-Id: I996ac7dfaee8a169b35f912abeadc94017151b52
2017-04-06 15:27:21 +00:00
Jason Monk
d2e75262cc Tuner plugin settings updates
Test: manual
Fixes: 33446852
Change-Id: I05c046bb70dff66ea25531503216f121e6618a62
2017-04-06 11:24:20 -04:00
Joseph Pirozzo
3c0f1f1aa2 Merge "Bluetooth Multi Connect" into oc-dev 2017-04-06 15:19:30 +00:00
Neil Fuller
24ff909a27 Canonicalize tz IDs when finding exemplar location
am: 2242ff73b8

Change-Id: I49d5e8fcb72a6382183f74404d5ecea2c501575b
2017-04-06 12:36:37 +00:00
Neil Fuller
0263781d53 Merge "Canonicalize tz IDs when finding exemplar location" am: 5e603a4b6e
am: 12ee401482

Change-Id: Ic2a14f99c7aa324aa62568ddd8c1c57c314ec754
2017-04-06 10:29:07 +00:00
Treehugger Robot
5e603a4b6e Merge "Canonicalize tz IDs when finding exemplar location" 2017-04-06 10:12:01 +00:00
Neil Fuller
2242ff73b8 Canonicalize tz IDs when finding exemplar location
Canonicalize time zone IDs when looking up exemplar location.

ICU's canonical IDs are not guaranteed the same as IANA's.
Various data files (e.g. timezones.xml, tzdata,
time_zones_by_country.xml) are using IANA IDs. ICU's IDs
are often the same, but because they are guaranteed not to
change and IANAs are not there is some drift.

This fixes an issue with the settings picker for ICU IDs:

America/Buenos_Aires
Asia/Rangoon
Asia/Katmandu
Asia/Calcutta

Which are IANA's:

America/Argentina/Buenos_Aires
Asia/Yangon
Asia/Kathmandu
Asia/Kolkata

introduced by commit b4d003da66.

It could also influence some display names for
automatically-selected time zones outside of this list.

The issues was particularly noticeable in locales that
use non-ASCII scripts; ICU performs a fallback if the ID
isn't canonical and would transform and return the last
part of the ID (e.g. Buenos Aires, Yangon, Kathmandu,
Kolkata).

Bug: 36469833
Test: Manual testing in Japanese
Change-Id: I2febdbee58e474d251d0a33f2c8335664a74581f
(cherry picked from commit f92ad8a0190add07779ed454a0908dd3df83f4bd)
2017-04-06 09:12:12 +00:00
Stephen Chen
9a4a1d9d8a Merge "Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration." into oc-dev
am: 154bbb003d

Change-Id: I12c7cede65e92f09a83a0217e2fdc560f4bdafdc
2017-04-06 04:29:08 +00:00
TreeHugger Robot
154bbb003d Merge "Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration." into oc-dev 2017-04-06 04:23:05 +00:00
Philip P. Moltmann
5d0b53b684 Add RecommendationPlugin for Cloud Print
Reuses already existing infrastructure. The mMDNSFilteredDiscovery lambda
is called for every network service that supports #PRIVET_SERVICE. Then
the plugin checks the txt fields to make sure the printer is valid. The
check is not complete but good enough to make sure this is either a
cloud print capable printer or something that tries really hard.

Test: Connected to network with three printers, 2 GCP capable. Found the
      two printers
Fixes: 35766193
Change-Id: I7c9180c8c154fa092fec5b943a94bad77da74c86
2017-04-05 19:51:08 -07:00
Stephen Chen
21f6868d80 Set AccessPoint metered bit using ScoredNetwork, WifiInfo, and WifiConfiguration.
Bug: 36888471
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I5228512a832665916520658acddc9bf93d78a1a1
2017-04-05 19:17:57 -07:00