Commit Graph

43403 Commits

Author SHA1 Message Date
Andreas Terzis
885c503f00 Merge "Increase string character limits to 40" into pi-dev
am: 2e7e15c82f

Change-Id: I41b251514ac761300e3c1923aa826648b2173e37
2018-03-13 18:31:24 +00:00
Doris Ling
20ed555112 Fix presubmit test failure.
- fix the typo in the manifest that reference the zen mode fragment.

Change-Id: Iae6975d015174fabb98033b917290c954c5483c2
Fixes: 74577539
Test: make SettingsUnitTests
2018-03-13 11:25:04 -07:00
Andreas Terzis
2e7e15c82f Merge "Increase string character limits to 40" into pi-dev 2018-03-13 17:58:12 +00:00
Lei Yu
cb77823b65 Update the restrict app list
Before this cl, we use getPackagesForOps() to populate restrict app
list. However in that API not all the apps are currently restricted,
so in this cl we filter out all the allowed apps.

Bug: 73085780
Test: RunSettingsRoboTest
Change-Id: Ia7c1eb95b07a1a0d203b394eb64dcd98d25bd561
2018-03-13 10:44:45 -07:00
Suresh Koleti
87e0d43237 Donot disable Wi-Fi Calling when getting "registration error" intent.
Test: Manual
Bug: 69446679
Merged-In: I95a108f4e6090b61e4584a64bed58c024e120fd0
Change-Id: I92869d091f3ad1ece5d3c33457d7601d07797639
2018-03-13 10:39:13 -07:00
Doris Ling
e83856b0c2 Merge "Update suggestion title and summary text." into pi-dev
am: 388b5314d7

Change-Id: I2cd2b0a74b5f07fd4115e74e9d30bf6354af9926
2018-03-13 01:10:58 +00:00
Doris Ling
388b5314d7 Merge "Update suggestion title and summary text." into pi-dev 2018-03-13 00:27:34 +00:00
Victor Chang
ef959abc5b Merge "Align the search view with the setting items" into pi-dev
am: f11976d817

Change-Id: Icb137a37b06643514f4c1f519b52ad61b1ad21e2
2018-03-13 00:27:00 +00:00
Beverly Tai
797d541953 Merge "Adding zen duration preference" into pi-dev
am: e652a039af

Change-Id: Ief1577186f507572471d65d9aa8cbdf8cb7e1d69
2018-03-12 23:29:41 +00:00
Alan Viverette
6b1fd5cfa9 Update for 1.0.0-beta1
Bug: 74449147
Test: make
Change-Id: I664b5f29efbb5d6c40420c0d8aaa8629ddfcd31b
2018-03-12 23:08:35 +00:00
Victor Chang
f11976d817 Merge "Align the search view with the setting items" into pi-dev 2018-03-12 22:58:53 +00:00
Ajay Panicker
19c35e5a7d Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
am: 5906621ea4

Change-Id: I643cee8c6e35519f41d15939ea80dab056649e37
2018-03-12 22:57:27 +00:00
Doris Ling
1c088eb185 Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev
am: 425f033782

Change-Id: I86b200c0e3a33fc1e3538a7a25eec8c249469fb0
2018-03-12 22:10:49 +00:00
Beverly Tai
e652a039af Merge "Adding zen duration preference" into pi-dev 2018-03-12 21:39:18 +00:00
Julia Reynolds
878e66baa8 Merge "Fix tests" into pi-dev
am: f22eb94b18

Change-Id: I42ade3f384469eb817555e9c6b6f7e76d2791870
2018-03-12 21:17:21 +00:00
TreeHugger Robot
5906621ea4 Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev 2018-03-12 21:08:59 +00:00
Andreas Terzis
33a6d0738a Increase string character limits to 40
Increase character limits for the "billing_cycle" and
"app_usage_cycle" strings to 40 characters because the
current limit of 30 characters is not enough for some
translations.

Test: manual
Test: make RunSettingsRoboTests
Bug: 70950124
Change-Id: I2091915ca78786f4b29de211b4635af45cb4946f
2018-03-12 13:00:20 -07:00
Victor Chang
9cc92cd90e Align the search view with the setting items
- Remove the margin and paddings in the search view

Bug: 73952488
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: I67fb420cf77fc427a550449a053f80dcf66d16ff
2018-03-12 19:40:31 +00:00
TreeHugger Robot
425f033782 Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev 2018-03-12 19:36:32 +00:00
Doris Ling
9de138b8ab Update suggestion title and summary text.
Bug: 73164111
Test: rebuild
Change-Id: I35db24cd78e88091154e5cbcc9fa089181f3edb2
2018-03-12 12:26:33 -07:00
TreeHugger Robot
f22eb94b18 Merge "Fix tests" into pi-dev 2018-03-12 19:22:22 +00:00
Ben Lin
c462dbee94 Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev
am: aedf00c4f8

Change-Id: Ie0d8a377c4c138b3bc1dcd1e8bd1bf0761d59d9a
2018-03-12 18:53:53 +00:00
Ben Lin
4bdd8476e2 Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev
am: 2d452df643

Change-Id: I027d3de2a7388da8b6ece1d03e9c2c5a0b4ffce9
2018-03-12 18:45:46 +00:00
Beverly
170b88c6fc Test for string changes in DND Sound Settings
Test: this
Change-Id: I47ba1d1bad6a5be04d718d2e58eaf5dd6c69f107
Fixes: 74529508
2018-03-12 14:35:27 -04:00
Ben Lin
aedf00c4f8 Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev 2018-03-12 17:52:47 +00:00
Ben Lin
2d452df643 Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev 2018-03-12 17:52:37 +00:00
Beverly
3f3c8acce7 Adding zen duration preference
Test: make ROBOTEST_FILTER=ZenModeDurationPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 73741459
Change-Id: I55a75897045ef059dc872bf6403a62f46cedc417
2018-03-12 13:46:32 -04:00
Beverly
23612e325b Update seconday text DND Exceptions preference
Test: manual
Bug: 74441398
Change-Id: Ibaa459aa368f62c4ef8cdbefef462848e7bc6fe7
2018-03-12 13:03:48 -04:00
Beverly
468ebafdc7 Merge "Updated dnd secondary text in sound settings" into pi-dev
am: c984e49262

Change-Id: I27d5c30102a5786e4e7a5aaf9306d1286089b33b
2018-03-12 15:33:19 +00:00
TreeHugger Robot
c984e49262 Merge "Updated dnd secondary text in sound settings" into pi-dev 2018-03-12 15:02:01 +00:00
Julia Reynolds
7b6422ee06 Fix tests
Test: make -j20 RunSettingsRoboTests
Change-Id: I40fda22b4a9da3df7f4319bc68a78d291c1b943d
Fixes: 74446970
2018-03-12 10:08:19 -04:00
Matthew Fritze
535e81e56e Merge "Declare official platform slice" into pi-dev
am: decea2055d

Change-Id: Ic0ae75607d275ff75f383d83ea1193ab8229ae1a
2018-03-12 03:24:40 +00:00
TreeHugger Robot
decea2055d Merge "Declare official platform slice" into pi-dev 2018-03-12 03:17:19 +00:00
Yohei Yukawa
3013858ec0 Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev
am: e1703e867a

Change-Id: I6d1e6304f2d592ec9ff46b265bd9937ed554bef9
2018-03-12 02:19:58 +00:00
TreeHugger Robot
e1703e867a Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev 2018-03-12 01:58:06 +00:00
Victor Chang
968a143b43 Merge changes from topic "picker-analytics" into pi-dev
am: 371404c404

Change-Id: I19783657cd7266b0055138ee9873d529f847d4b4
2018-03-10 12:39:17 +00:00
Victor Chang
c2f0fcd32e Add tron metric logging
am: ab775e1b0f

Change-Id: I443c5e8ca14dbe033085eae69342ee09893d059e
2018-03-10 12:38:36 +00:00
Victor Chang
371404c404 Merge changes from topic "picker-analytics" into pi-dev
* changes:
  Fix UX problems in time zone pickers
  Add tron metric logging
2018-03-10 12:24:38 +00:00
jackqdyulei
ed48fd0a7e Merge "Add extra log for battery tip." into pi-dev
am: 9fc80c5064

Change-Id: I9d7f8c9fba445c8d4766c2bd62550bece920ee46
2018-03-10 05:34:36 +00:00
Weilun Du
198f54d552 Merge "Disable bluetooth controller if unsupported" into pi-dev
am: a63d41da21

Change-Id: Iaecb698fb95d91a8687ef8c18c8902e2318e518f
2018-03-10 05:25:32 +00:00
Lei Yu
c525d1d26a Merge "Make battery seekbar update continuous" into pi-dev
am: defea95e1d

Change-Id: Ia9302da923237fc99f1278c5f118ab1c3efa2807
2018-03-10 05:04:37 +00:00
TreeHugger Robot
9fc80c5064 Merge "Add extra log for battery tip." into pi-dev 2018-03-10 01:43:04 +00:00
TreeHugger Robot
a63d41da21 Merge "Disable bluetooth controller if unsupported" into pi-dev 2018-03-10 01:21:41 +00:00
Ajay Panicker
80f1e63b9d Merge "Bluetooth: Enable AVDTP Delay reports by default." am: f8ad32823c -s ours
am: 76e5237e92

Change-Id: I100d661935afe40657e6de516120d0a4eb651ea2
2018-03-10 00:59:27 +00:00
Ben Lin
a53001dd13 Introduce boolean flag to show/hide Reset Options.
This adds one new flag:
config_show_reset_dashboard

Which when set to false, will hide Reset Options from System settings.

Bug: 74127210
Test: Updated robotests
Change-Id: I42b14a0abde575f5c4e51985125e8543716d206a
(cherry picked from commit bd180a62ec)
2018-03-10 00:26:15 +00:00
Ben Lin
1f61ff4cf9 Introduce boolean flags to show/hide Encryption status.
This adds one new flag:
config_show_encryption_and_credentials_encryption_status

Which when set to false, will hide Encryption status from Encryption &
credentials. This is when the storage is not being handed by Android,
and so this preference would not be necessarily correct.

Bug: 74127210
Test: Updated robotests
Change-Id: I13665fa369086ef29a4de5f99a78bfbaf96f2f6b
(cherry picked from commit 2d5df469d3)
2018-03-10 00:25:16 +00:00
TreeHugger Robot
defea95e1d Merge "Make battery seekbar update continuous" into pi-dev 2018-03-10 00:22:39 +00:00
Ajay Panicker
76e5237e92 Merge "Bluetooth: Enable AVDTP Delay reports by default."
am: f8ad32823c  -s ours

Change-Id: If7d482f107e0ce4924748c8b08334cfbbef491e8
2018-03-10 00:08:20 +00:00
Doris Ling
1063e48ab8 Fix failing testcases in SettingsAdapterTest.
- added the shadow class for CardView to fix the not implemented error.

Change-Id: I17a53f804310ffb3330c1cd3ca11943cf91335a6
Fixes: 74446970
Test: make RunSettingsRoboTests
2018-03-09 15:48:50 -08:00
jackqdyulei
513ddb14a6 Add extra log for battery tip.
For each visible battery tip, logs its type and state. For battery tip
with app list, also log that list:

1. HighUsageTip: apps that used too much battery
2. RestrictAppTip: apps with anomaly, also logs the anomaly type

Bug: 73888115
Test: RunSettingsRoboTests
Change-Id: I1b61eb1d793d979baab4864d2d652e12260b590d
2018-03-09 15:47:03 -08:00