Commit Graph

37484 Commits

Author SHA1 Message Date
Marie Janssen
56adef485a Bluetooth: Make notifications local-only am: 1138397336
am: 0efa2b3427

Change-Id: I2b308d2646693280cb6e0f69106e94b481c526e3
2017-06-23 00:26:53 +00:00
Marie Janssen
493a76e087 Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: I26d09208b0425e5cdfb8317c7aa782ad0ef1fe5d
2017-06-23 00:22:24 +00:00
Marie Janssen
0efa2b3427 Bluetooth: Make notifications local-only
am: 1138397336

Change-Id: Id287a1ba31898da57385a8e72cacbe03d7b78946
2017-06-23 00:22:23 +00:00
Fan Zhang
aedcd8b519 Fix presubmit test
Change-Id: I8c1f35fc76ed153080655242943fdfa9c29cf5bb
Fix: 62913954
Test: robotests
2017-06-22 15:51:54 -07:00
Fan Zhang
49534b765e Remove redundant talkback readout when rebooting device
Change-Id: I0b3bf7d0d75c4f19c234977be5caa74496c67a94
Fix: 62418304
Test: manual
2017-06-22 15:04:41 -07: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
Maurice Lam
71dfd08b97 Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev am: e1eae4f05f
am: 6d33cabb0f

Change-Id: I3c2517cab313b9f3bf4411bb02de8455ffdb0e66
2017-06-22 21:35:36 +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
Maurice Lam
6d33cabb0f Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev
am: e1eae4f05f

Change-Id: I4ef2d7373d80c95c1df60ee8af9dcae2e3ac61b6
2017-06-22 19:58:02 +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
Maurice Lam
e1eae4f05f Merge "Update CHAR LIMIT for fingerprint dialog" into oc-dr1-dev 2017-06-22 19:48:12 +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
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