Commit Graph

43608 Commits

Author SHA1 Message Date
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
Yuchen Chang
35c14a2ac3 Revert "[Settings] Request focus in Add network dialog"
This reverts commit 49d314f8c3.

Reason for revert: Revert for proper fix in pi-dev branch. Solution in 
 http://ag/3714337 is proper fix to make all case in wifi dialog can get focus.

Change-Id: I99035a4c437ea6c033e3ba6a83e39967c236d973
2018-03-13 05:26:47 +00:00
Doris Ling
ae038f6a06 Merge "Update suggestion title and summary text." into pi-dev am: 388b5314d7
am: e83856b0c2

Change-Id: I622982dfe5073ec645bccc02e48bb1710bb5cfaf
2018-03-13 04:10:37 +00:00
TreeHugger Robot
d5fb944de2 Merge "Don't log sim-pin" 2018-03-13 02:50:42 +00:00
Victor Chang
923e5b3ed3 Merge "Align the search view with the setting items" into pi-dev am: f11976d817
am: ef959abc5b

Change-Id: I5f4a8a5944ac9b323007eee60530f200d2691d38
2018-03-13 02:35:38 +00:00
Beverly Tai
060f852332 Merge "Adding zen duration preference" into pi-dev am: e652a039af
am: 797d541953

Change-Id: I294a0691c708066d22d2b569ff7678ae9bb47848
2018-03-13 01:12:33 +00: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
Ajay Panicker
7b2a1f67be Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev am: 5906621ea4
am: 19c35e5a7d

Change-Id: Ib14ae9f72f4f2173e1246e60fde82558d84c057d
2018-03-13 00:35:51 +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
Doris Ling
0b5582fe14 Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev am: 425f033782
am: 1c088eb185

Change-Id: I3ca913ab7ffcdec2ede4d7fad39e89dd4f376492
2018-03-12 23:19:48 +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
Julia Reynolds
a1cb8216ed Merge "Fix tests" into pi-dev am: f22eb94b18
am: 878e66baa8

Change-Id: I9a24f5683ba339a5f874fac2bf7eca4daf22ac25
2018-03-12 22:06:53 +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
Ben Lin
6d3511c9b3 Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev am: aedf00c4f8
am: c462dbee94

Change-Id: I10dcd41fdefe36f63711b2eb8c11d113fb3749ac
2018-03-12 19:32:12 +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
119a10794e Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev am: 2d452df643
am: 4bdd8476e2

Change-Id: I9dc0115a4888c4097528e8f79f8e27d634686621
2018-03-12 19:05:31 +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
a4727c70d1 Merge "Updated dnd secondary text in sound settings" into pi-dev am: c984e49262
am: 468ebafdc7

Change-Id: I4e3351ccd315665383e0776b81d556b3e56b85f3
2018-03-12 16:23:17 +00: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
Jacky Wang
e462c0ab72 Not all selected languages are deleted in language preferences
Bug: 67883179
Change-Id: I650084cc3fceb82c874e8e8e36bf5182da183f2b
Fixes: 67883179
Test: manual test by following the reproduce steps
Test: verify the issue is fixed
2018-03-12 05:25:46 +00:00
Matthew Fritze
7b6b22301e Merge "Declare official platform slice" into pi-dev am: decea2055d
am: 535e81e56e  -s ours

Change-Id: Ied4cb1664ed7ba5838cdb86208c668bce21fbfcf
2018-03-12 03:33:41 +00: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
6042f68aa9 Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev am: e1703e867a
am: 3013858ec0

Change-Id: Ia0047941e8162ba940f0ee2b9b903bafbaea35af
2018-03-12 02:40:29 +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
5d46b1de10 Merge changes from topic "picker-analytics" into pi-dev am: 371404c404
am: 968a143b43

Change-Id: Id58b0d364e4b22656a6eefecb13be905a353b2c6
2018-03-10 12:51:03 +00:00
Victor Chang
13b48736af Add tron metric logging am: ab775e1b0f
am: c2f0fcd32e

Change-Id: Ibfc5af17166d01d3d1db5b93c9ec1e88ece09766
2018-03-10 12:50:24 +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