Commit Graph

4041 Commits

Author SHA1 Message Date
Ecco Park
3c6c75fbc8 Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev am: de08983dd2
am: 02d22b46ac

Change-Id: I3c6a95aa878022589c395db16806f43ad4795d52
2018-03-14 07:09:08 +00:00
TreeHugger Robot
de08983dd2 Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev 2018-03-14 06:53:12 +00:00
jackqdyulei
e99d8c0f09 Merge "Add dialog for summary tip" into pi-dev am: 349c9b2691
am: e107c4394f

Change-Id: Icbd24c8c8d9eb4ab22bfee7c46a9e4c72b7d3466
2018-03-14 06:14:56 +00:00
Lei Yu
d94fa53b40 Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev am: 61bdf047a4
am: 4aaa8df9d0

Change-Id: I19629525cf265267ca2560d3c6c8c1f66b708d9e
2018-03-14 06:13:46 +00:00
TreeHugger Robot
349c9b2691 Merge "Add dialog for summary tip" into pi-dev 2018-03-14 05:47:12 +00:00
TreeHugger Robot
61bdf047a4 Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev 2018-03-14 05:47:10 +00:00
Lei Yu
70d71748f4 Change default value for SOFT_AP_TIMEOUT_ENABLED
Change the default value to 1.

Change-Id: I78a69d6224ad417537be59ce51357e1093d6bae4
Fixes: 73501186
Test: RunSettingsRoboTests
2018-03-13 17:20:16 -07:00
Ecco Park
bffd531aa3 Fix the system crash issue when secondary user clicks any 802.1x AP on
Wifi Picker.

Catch the exception when keystore failed to list the certs

Bug: 73794111
Test: test it with clicking the Google-A on Wifi Picker.
Test: make ROBOTEST_FILTER="(WifiConfigControllerTest)"
RunSettingsRoboTests -j32
RunSettingsRoboTests: OK (12 tests)

Change-Id: I0db66730261c72ef35d1b299bacd2aed7710d247
2018-03-13 16:49:08 -07:00
Android Build Merger (Role)
39f5286a3e Merge "Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114 am: 57cda98f4c" 2018-03-13 23:08:42 +00:00
Doris Ling
668d9b733c Merge "Revert "[Settings] Request focus in Add network dialog"" 2018-03-13 22:49:35 +00:00
Beverly
917c8fb21e Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114
am: 57cda98f4c

Change-Id: I102fc43f6dc91f1bbeefdea822007475f0645768
2018-03-13 22:35:42 +00:00
jackqdyulei
ede87ce19f Add dialog for summary tip
Also change SummaryTip to store the time data, which is used
in the dialog. If "Full last charge" time is available, show
normal message otherwise show message without it.

Bug: 72997971
Test: RunSettingsRoboTests
Change-Id: I4ce94f0935465a18275edb13e3be343313427c3b
2018-03-13 15:23:20 -07:00
TreeHugger Robot
e9fbcd7114 Merge changes from topic "dnd_touch_sounds" into pi-dev
* changes:
  Test for string changes in DND Sound Settings
  Update seconday text DND Exceptions preference
2018-03-13 19:58:51 +00: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
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
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
Beverly Tai
e652a039af Merge "Adding zen duration preference" into pi-dev 2018-03-12 21:39:18 +00:00
TreeHugger Robot
5906621ea4 Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev 2018-03-12 21:08:59 +00:00
TreeHugger Robot
425f033782 Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev 2018-03-12 19:36:32 +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
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
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
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
8267c9ab7e Merge "Add extra log for battery tip." into pi-dev am: 9fc80c5064
am: ed48fd0a7e

Change-Id: I7fc0f3a46eeaed3620286438d36b9f0de561e6e3
2018-03-10 11:11:46 +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
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
Doris Ling
e6811b4501 Bypass failing test for SuggestionAdapterTest. am: d95e1752f6
am: 98706c3185

Change-Id: I1cb221fe238d997dcd52391d0e6e755c85bce48e
2018-03-10 00:11: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
Weilun Du
d4e1b94b58 Disable bluetooth controller if unsupported
Only disable the controllers not the whole fragment because
user might need to have entry for other features.

Fixes: 73664409
Merged-In: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Change-Id: I98ed248cf33d11715dd523e711cbc68ebf128ef8
Signed-off-by: Weilun Du <wdu@google.com>
(cherry picked from commit 68a195ae93)
2018-03-09 23:40:40 +00:00
Lei Yu
e5525fa1b5 Merge "Change anomalyType to ArraySet in AppInfo" into pi-dev am: 7208905cb9
am: 6079093af3

Change-Id: Ic8d589093eb17c6f19ed84e20a33f3649a5cfa9c
2018-03-09 23:27:37 +00:00
Doris Ling
d95e1752f6 Bypass failing test for SuggestionAdapterTest.
- other changes might have caused this test to start failing. Need more
time to investigate or properly fix the tests. Since they are blocking
presubmit right now, will ignore the tests first and provide fix
later.

Bug: 74444815
Test: make RunSettingsRoboTests
Change-Id: I985abe74c64a562fb117b91056a23895181897bd
2018-03-09 14:21:05 -08:00
Ajay Panicker
ff6a90994f Bluetooth: Enable AVDTP Delay reports by default.
Bug: 32755225
Test: See that delay reports are enabled when connecting to device
Change-Id: Icba9be6fc8ba455d37df39d283e36129f6acb536
(cherry picked from commit a8cf0b9371)
2018-03-09 21:21:45 +00:00
Victor Chang
ca529d9e89 Fix UX problems in time zone pickers
- Remove emoji region flag in the region picker.
  It's more consistent with locale picker which shows no flag in region
  picker
- Remove redundant information in the summary field
  e.g. same GMT offset in primary and secondary field in fixed offset
  picker
- Better mode switching flow. Switch region/fixed offset mode
only when the user confirms their selection in the picker.

Bug: 73952488
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Id5da8a2516acd10c9a3d71181e94bc617d797d20
2018-03-09 19:48:14 +00:00
Victor Chang
ab775e1b0f Add tron metric logging
- one tracking id for every picker type

Bug: 73952488
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ia487f1657d6ed1f0fb40b61f39f4a47c38bd6179
2018-03-09 19:48:05 +00:00
Matthew Fritze
a4a3dfffa2 Declare official platform slice
Create the notion of an official platform slice.
This includes:
- Adding a second authority to the provider
- tagging slices in xml with a platform slice flag
- Including authority in the getUri method

Bug:73359139
Test: robotests
Change-Id: I5382be138a262dbc5a8324c34aab131c5d0d5516
Merged-In: I581ee6dfcdf935f452a15e89e5d055e375ff1877
2018-03-09 18:04:06 +00:00
Ajay Panicker
a8cf0b9371 Bluetooth: Enable AVDTP Delay reports by default.
Bug: 32755225
Test: See that delay reports are enabled when connecting to device
Change-Id: Icba9be6fc8ba455d37df39d283e36129f6acb536
2018-03-09 17:59:26 +00:00
Lei Yu
7208905cb9 Merge "Change anomalyType to ArraySet in AppInfo" into pi-dev 2018-03-09 17:38:53 +00:00
Julia Reynolds
7ba6604850 Merge "Show new visual effects options in dnd settings" into pi-dev am: e056b2ebc9
am: 45e8898f7e

Change-Id: I380430deac85016196bfcc4f9f469c9b49c3fef8
2018-03-09 17:04:54 +00:00
Julia Reynolds
e056b2ebc9 Merge "Show new visual effects options in dnd settings" into pi-dev 2018-03-09 13:38:06 +00:00
Makoto Onuki
39ba053925 Merge "Get auto-battery saver threshold max from global setting" into pi-dev am: d29926c5a1
am: 5042f95d16

Change-Id: Ib7e83a9a483840edfd8376381798a7825b345ea4
2018-03-09 09:18:59 +00:00