Commit Graph

38210 Commits

Author SHA1 Message Date
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
Marie Janssen
620fe71520 Merge "Bluetooth: Make notifications local-only"
am: 348a7085fa

Change-Id: I7de9c9c01f1f704399c1b594beafca5bc14ef8df
2017-06-22 15:37:28 +00:00
Treehugger Robot
348a7085fa Merge "Bluetooth: Make notifications local-only" 2017-06-22 15:31:39 +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
27883720a9 Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev am: d392a9bfbb
am: 5bc7075d48  -s ours

Change-Id: I69d48c1c8b70d93edd0d965e01dd4086abf59af9
2017-06-22 14:35:51 +00: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
Maurice Lam
8ee5170c07 Update CHAR LIMIT for fingerprint dialog
Test: Existing tests pass
Bug: 62401478
Change-Id: I6baf88007c3f61b88603f4d5c1ee52e66e9d54dc
2017-06-21 20:17:41 -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
TreeHugger Robot
ee947e9a31 Merge "Refresh the dashboard UI when swiping away the only suggestion." into oc-dr1-dev 2017-06-22 01:33:23 +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
Doris Ling
319516eb66 Merge "Add summary text for account sync." into oc-dr1-dev am: 053e3dcf9f
am: 0376b0b78b

Change-Id: If72db334afd790080bb86038c3e20aca70838605
2017-06-22 00:23:23 +00: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
0376b0b78b Merge "Add summary text for account sync." into oc-dr1-dev
am: 053e3dcf9f

Change-Id: I833262facb7c027e26fd0507f9bd4f471a11e280
2017-06-22 00:13:57 +00:00
TreeHugger Robot
053e3dcf9f Merge "Add summary text for account sync." into oc-dr1-dev 2017-06-21 23:59:40 +00:00
TreeHugger Robot
9b00e0ca8d Merge "Update entity header to match mock" 2017-06-21 23:52:39 +00: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
Fan Zhang
ab55528e5a Update entity header to match mock
- Also add a small screen width version

Change-Id: I284561cd713d8382845db02c163983623cede038
Fix: 62709577
Test: existing tests still pass
2017-06-21 15:13: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
Bill Yi
0e8bd16ccf Import translations. DO NOT MERGE am: ae5a31e55c -s ours am: f6e125b46d -s ours
am: 85a0fab72f  -s ours

Change-Id: I94b211bc1aeec9f3e12c9e718ad02bec29ad8678
2017-06-21 20:38:41 +00:00
Bill Yi
0141622074 Import translations. DO NOT MERGE am: ae5a31e55c -s ours am: a3821d019a -s ours
am: 7b13f1c0fb  -s ours

Change-Id: I724ddd065756f785fc6ea560bc10606ee0fe78cf
2017-06-21 20:37:54 +00:00
Bill Yi
85a0fab72f Import translations. DO NOT MERGE am: ae5a31e55c -s ours
am: f6e125b46d  -s ours

Change-Id: I4329c03e80a2f9234e8b23a926ecb39e1a3c56bf
2017-06-21 20:29:57 +00:00
Bill Yi
7b13f1c0fb Import translations. DO NOT MERGE am: ae5a31e55c -s ours
am: a3821d019a  -s ours

Change-Id: I2fdc4eb1a34ad7a16a3325cbee96d61434da5f6f
2017-06-21 20:26:57 +00:00
Bill Yi
f6e125b46d Import translations. DO NOT MERGE
am: ae5a31e55c  -s ours

Change-Id: Ibd2297385f91e2bf12e90f4933c785104aa6e153
2017-06-21 20:23:16 +00:00
jackqdyulei
c0181d66af Merge "Increase char limit for "Disconnect"" into oc-dr1-dev am: 88163b7215
am: 7027c83112

Change-Id: I5c17a83e483007473ceef77d766f7c728a592a2d
2017-06-21 20:21:54 +00:00
Bill Yi
a3821d019a Import translations. DO NOT MERGE
am: ae5a31e55c  -s ours

Change-Id: Ic37588db9f8b69ef7fa7d69c27e717ac4f241383
2017-06-21 20:21:34 +00:00
jackqdyulei
7027c83112 Merge "Increase char limit for "Disconnect"" into oc-dr1-dev
am: 88163b7215

Change-Id: I79b61d5b028dbcf22d8369cef7b92463fd90b498
2017-06-21 20:12:53 +00:00
Doris Ling
c5c2f10fc5 Add summary text for account sync.
Bug: 62862167
Test: builds
Change-Id: I7e3c7e76791d9f79430b2b549d4d89a18a4e2bba
2017-06-21 13:12:41 -07:00
TreeHugger Robot
88163b7215 Merge "Increase char limit for "Disconnect"" into oc-dr1-dev 2017-06-21 19:55:51 +00:00
TreeHugger Robot
8b8316ffa7 Merge "Import translations. DO NOT MERGE" 2017-06-21 19:49:34 +00:00
Bill Yi
2d99d07fc7 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ce043d0f98 -s ours
am: 6e3b702c5a  -s ours

Change-Id: I9d17eb83d26c6e58d9c0287179dcc2874126dd0e
2017-06-21 19:47:27 +00:00
Bill Yi
6e3b702c5a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: ce043d0f98  -s ours

Change-Id: Ic700813442af82b979b645e465b2d5ac28ac4a74
2017-06-21 19:44:58 +00:00
TreeHugger Robot
ce043d0f98 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-21 19:42:37 +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