Commit Graph

18891 Commits

Author SHA1 Message Date
TreeHugger Robot
f964e8c3b2 Merge "Load regulatory info from /data/misc" into oc-dr1-dev 2017-06-23 01:37:47 +00:00
Marie Janssen
493a76e087 Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
2017-06-23 00:22:24 +00:00
Maurice Lam
9534677b9e Merge "Tint suggestion icons" into oc-dr1-dev am: c1ab582fae
am: a1130d5d12

Change-Id: Ia355e3fb4026afae6f8582053cc07e1fb9728a93
2017-06-22 21:58:54 +00:00
Maurice Lam
a1130d5d12 Merge "Tint suggestion icons" into oc-dr1-dev
am: c1ab582fae

Change-Id: I8ad6d1c3ccd3c759981472cb7119dbb50dc90e99
2017-06-22 21:44:22 +00:00
Maurice Lam
554c95fbb1 Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev am: cf3130338c
am: 15bcab49f7

Change-Id: Ib5cbaaa4c7bcfce89ed491e5ab02fd3069549efc
2017-06-22 21:36:47 +00:00
Doris Ling
296bdda5df Merge "Update summary for Recent Apps." into oc-dr1-dev am: d7fc071f48
am: dc361053a0

Change-Id: Ibd4dbb2d883a16d3d0811b15dbda9825178d5833
2017-06-22 21:34:40 +00:00
TreeHugger Robot
c1ab582fae Merge "Tint suggestion icons" into oc-dr1-dev 2017-06-22 21:33:42 +00:00
Fan Zhang
1bc7ac3bfa Load regulatory info from /data/misc
Bug: 62837579
Test: settings test
Change-Id: I84ef037174a1839993d02e8cd46d159398be1ddc
2017-06-22 20:13:21 +00:00
Fan Zhang
86542ec1f6 Add a flag to enable/disable new device suggestion
Change-Id: Iebf982731a01b3d6c1d3ad60e9d1f858f4e9151e
Fix: 62907886
Test: make RunSettingsRoboTests
2017-06-22 20:03:09 +00:00
Maurice Lam
15bcab49f7 Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev
am: cf3130338c

Change-Id: I5ee371963f73c8f645618a12949f545c2f88ca82
2017-06-22 20:02:48 +00:00
TreeHugger Robot
cf3130338c Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev 2017-06-22 19:58:51 +00:00
Doris Ling
dc361053a0 Merge "Update summary for Recent Apps." into oc-dr1-dev
am: d7fc071f48

Change-Id: I076f239380ffd7883e1907d1f409d47127483cdc
2017-06-22 19:57:20 +00:00
TreeHugger Robot
03849d1484 Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat" 2017-06-22 19:49:35 +00:00
TreeHugger Robot
d7fc071f48 Merge "Update summary for Recent Apps." into oc-dr1-dev 2017-06-22 19:39:10 +00:00
TreeHugger Robot
176506e54c Merge "Catch invalid extra when launching help trampoline." 2017-06-22 19:23:45 +00:00
TreeHugger Robot
21e6b40a0f Merge "Move Apps & notifications -> App permissions into Advanced." 2017-06-22 19:23:21 +00:00
Salvador Martinez
bbb5ed60bf Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev am: ed66c5fcdf
am: 23888a246b

Change-Id: I7f82ff69a26028721b6d510b1350191654c84c05
2017-06-22 18:50:40 +00:00
Salvador Martinez
23888a246b Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev
am: ed66c5fcdf

Change-Id: I54f1e94106a2ac984a7f736706e4c70b5db9b584
2017-06-22 18:47:11 +00:00
TreeHugger Robot
ed66c5fcdf Merge "Fix BatteryInfo using enhanced estimate for charge time" into oc-dr1-dev 2017-06-22 18:42:16 +00:00
Maurice Lam
992fa86d52 Tint suggestion icons
If the suggestion is marked as isIconTintable, tint the icon with
colorControlNormal.

Test: cd tests/robotests && mma
Bug: 62258845
Change-Id: I2a76181d9b8b4d9fbf496a8fc605cb762bba87c0
2017-06-22 11:40:34 -07:00
Fan Zhang
d96f3bf04e Catch invalid extra when launching help trampoline.
Change-Id: Ifb4b6fefe507cf403065436fca7a46d3a00afda7
Fix: 62821816
Test: robotests
2017-06-22 10:34:07 -07:00
Salvador Martinez
cb9c53dd7c Fix BatteryInfo using enhanced estimate for charge time
Due to a typo in BatteryEstimates the enhanced estimate we use
for discharging would also be used for charging. This CL corrects
the typo and adds a simple test to catch a similar mistake in the
future. We were also always loading the enhanced estimate even when
we were not using it. As a ~*bonus*~ it should also help improve
the speed of the charging use case for this screen and fixes an
issue with the battery not switching to the charging icon in the
main battery page.

Test: robotest
Bug: 62738028
Bug: 62873396
Bug: 62784575
Bug: 62736144
Change-Id: Ib2cbdeea22afb7da590b701b84f526bdac243410
2017-06-22 09:42:36 -07:00
TreeHugger Robot
68722d4add Merge "Notification settings to match ixd mocks: - added default sound config to general notification settings page - reordered items to match docs" 2017-06-22 16:29:19 +00:00
Marie Janssen
1138397336 Bluetooth: Make notifications local-only
This will prevent them from showing up on external devices where they
would be less than useful.

Test: connect to watch and pair a device
Bug: 34612389
Change-Id: I8b02c20200ce78a73967b8121cf7d5653b68f356
(cherry picked from commit 426903d155)
2017-06-22 16:18:59 +00:00
Marie Janssen
5e50f15249 Merge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520 am: 3cc4522cbc
am: 852c930bfd

Change-Id: I410601bd3df4d4cfc2a1d212d972904610a8ea19
2017-06-22 15:48:58 +00:00
Marie Janssen
852c930bfd Merge "Bluetooth: Make notifications local-only" am: 348a7085fa am: 620fe71520
am: 3cc4522cbc

Change-Id: I74688eb24e40c7c1a370a9b36dec09b876047011
2017-06-22 15:46:01 +00:00
Marie Janssen
3cc4522cbc Merge "Bluetooth: Make notifications local-only" am: 348a7085fa
am: 620fe71520

Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
2017-06-22 15:41:55 +00:00
Alison Cichowlas
4fe455de57 Notification settings to match ixd mocks:
- added default sound config to general notification settings page
- reordered items to match docs

Bug: 37481153
Test: RunSettingsRoboTests; manual

Change-Id: I2404f0a3f97601c8b3a9d15de58e1d53bf801c45
2017-06-22 10:44:27 -04:00
Juan Lang
5bc7075d48 Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev
am: d392a9bfbb

Change-Id: I5696ba7e3fceb0ef81ea8609b573581b047bb3b7
2017-06-22 14:17:37 +00:00
Juan Lang
d392a9bfbb Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev 2017-06-22 14:05:56 +00:00
Roozbeh Pournader
1587224193 Switch Utils.formatElapsedTime to use ICU's MeasureFormat
Previously, localizable strings were used instead, causing various
difficulties and inconsistencies.

Now we use ICU's MeasureFormat. The results for English are almost
identical to the previous results (see below), and we also get higher
quality and better-vetted results for other locales.

Note: This also makes formatted strings shorter by eliminating zeros.
For example, what was previously shown as "2d 0h 15m" is now shown as
"2d 15m".

Bug: 36994779
Bug: 37701311
Test: make -j RunSettingsRoboTests
Change-Id: I78fd09e4e7f63f41ef88d3d3fc4ba2be15e1d812
2017-06-21 21:04:37 -07:00
Doris Ling
c225ee4e0a Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev am: ee947e9a31
am: 11a93be4a7

Change-Id: Ib7b082644764d0dd43d29417f5076e99b37e856f
2017-06-22 01:43:56 +00:00
Doris Ling
11a93be4a7 Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev
am: ee947e9a31

Change-Id: Iee52408640206b365546614e5e8e6642a0a0d96d
2017-06-22 01:40:58 +00:00
Jack Yu
c3cab8ecb8 Refactored area update info support
1. Refactored area update information support so it
   is not limited to channel 50 and Brazil.
2. Added channel 60 for India.

Test: Manual
bug: 37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
2017-06-21 17:43:43 -07:00
Maurice Lam
34a181aceb Create add more fingerprint suggestion for setup
Create FingerprintSuggestionActivity which is a suggestion shown in
setup to allow the user to add more fingerprints for unlocking the
device.

Test: cd tests/robotests && mma
Bug: 62638180
Change-Id: Icfab9bd2523fdeadc4cc6f0ad4f45606260c4755
2017-06-21 17:17:48 -07:00
Doris Ling
fa58cfca6e Refresh the dashboard UI when swiping away the only suggestion.
In the new suggestion UI, the suggestions are listed inside the
suggestion container instead of individual dashboard items. When there
is only a single suggestion shown, and that is being swiped away, the
actual list for the suggestions will handle the swipe and remove that
list item from the list. However, the top level container will remain
until next time the dashboard list is being refreshed. Explicitly set
the suggestions to null to force refreshing of the dashboard UI.

Change-Id: I37f8c8f5a813a5c56f4f2f46103fdbb66ce97fcd
Fix: 62639824
Test: make RunSettingsRoboTests
2017-06-21 15:37:31 -07:00
Juan Lang
c04c3f7bd7 Use SettingsLib's versions of Custom* classes.
Bug: 30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
2017-06-21 14:47:37 -07:00
Juan Lang
d5d43ddc77 Merge "Use SettingsLib's versions of Custom* classes." 2017-06-21 21:25:19 +00:00
TreeHugger Robot
7dc5e8242f Merge "Tell SIMs apart in Data usage settings in multi-SIM case" 2017-06-21 21:05:42 +00:00
Yoshinori Hirano
c55ca0bf56 Tell SIMs apart in Data usage settings in multi-SIM case
In multi-SIM case, multiple "Mobile" categories are shown in Data usage
settings. To fix this issue, SubscriptionInfo#getDisplayName() should be
used instead of "Mobile".

Fixes: 62779261
Test: manual - go to Settings > Network & Internet > Data usage

Author: Wu Qiang <qiang.x.wu@sonymobile.com>
Change-Id: I4d95eceb24efd78ea3f3782d3a613edd2cf37d65
2017-06-21 12:10:11 -07:00
Juan Lang
4482812cb1 Use SettingsLib's versions of Custom* classes.
Test: make RunSettingsRoboTests
Change-Id: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
2017-06-21 12:07:50 -07:00
Daniel Nishi
b6360d932b Merge "Don't accordion the progress bar out." into oc-dr1-dev am: 648e31c283
am: 7ffa9b3a7b

Change-Id: If196b0729631c0817113e53b5126fc30b75c2833
2017-06-21 18:28:53 +00:00
Daniel Nishi
7ffa9b3a7b Merge "Don't accordion the progress bar out." into oc-dr1-dev
am: 648e31c283

Change-Id: If1c7ba281f0a959a9efc1e8c04b1cad8260b7020
2017-06-21 18:26:22 +00:00
Daniel Nishi
648e31c283 Merge "Don't accordion the progress bar out." into oc-dr1-dev 2017-06-21 18:21:20 +00:00
Lei Yu
d33cf5e37d Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev am: 2e34b94817
am: 5445997519

Change-Id: I92f71bde2b2143263aa1cd5bc7118eaf53df5e92
2017-06-21 18:03:51 +00:00
Matthew Fritze
d56bf722f6 Merge "Block inline-results from Settings search" into oc-dr1-dev am: bea9a5d739
am: eeec8eecc0

Change-Id: I8094a44c26f0c9d457c1df7d67b6ee0e0fa672ab
2017-06-21 18:03:00 +00:00
Lei Yu
5445997519 Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev
am: 2e34b94817

Change-Id: I986039cb676054b31b41ce54ab3c9c034297721f
2017-06-21 17:49:50 +00:00
Lei Yu
2e34b94817 Merge "Make icon in Anomaly detail page have badge." into oc-dr1-dev 2017-06-21 17:44:44 +00:00
Matthew Fritze
eeec8eecc0 Merge "Block inline-results from Settings search" into oc-dr1-dev
am: bea9a5d739

Change-Id: Ie9ba24744922dccedfec07a034c2374695f77214
2017-06-21 17:42:48 +00:00
TreeHugger Robot
bea9a5d739 Merge "Block inline-results from Settings search" into oc-dr1-dev 2017-06-21 17:26:10 +00:00