Commit Graph

55310 Commits

Author SHA1 Message Date
Raff Tsai
312e287bb8 Fix crash after uninstalling app am: 637d419157 am: 87dbb3c42c
am: e097aabbf9

Change-Id: I4be4a28353ccbe4f4a0ef6e815a01398c0c69342
2019-07-24 05:38:43 -07:00
Android Build Merger (Role)
b6ee6e287d Merge "Fix crash after uninstalling app am: 637d419157 am: cef4f97569" into qt-qpr1-dev-plus-aosp 2019-07-24 12:29:57 +00:00
Raff Tsai
03572035af Fix crash after uninstalling app am: 637d419157
am: cef4f97569

Change-Id: Iaf2fe83efcd510962c71e757cad83f7e8f9e0943
2019-07-24 05:29:41 -07:00
Raff Tsai
e097aabbf9 Fix crash after uninstalling app am: 637d419157
am: 87dbb3c42c

Change-Id: I64e40aa595bdd9fe4a8870b28533dd22438d7a23
2019-07-24 05:29:40 -07:00
Raff Tsai
87dbb3c42c Fix crash after uninstalling app
am: 637d419157

Change-Id: I48bf6ceb772fb5ebd1f6ebf8cff12ea664f963c5
2019-07-24 05:20:42 -07:00
Raff Tsai
cef4f97569 Fix crash after uninstalling app
am: 637d419157

Change-Id: Ib68843298dfcb71de6198a988f153397aabeb7f3
2019-07-24 05:20:40 -07:00
TreeHugger Robot
9a6dbf60c1 Merge "Put newly discovered devices to the bottom of the list" 2019-07-24 10:36:01 +00:00
Raff Tsai
637d419157 Fix crash after uninstalling app
updateState was invoked in loader callback. But the
package was uninstalled at the callback time caused
null pointer exception. Add null check to prevent
null pointer access.

Fixes: 136170218
Fixes: 133771724
Test: make RunSettingsRoboTests, manual
Change-Id: I2715e77f6e32af42a4bce70c9f409b0311eb36c4
(cherry picked from commit 790a822526)
2019-07-24 08:36:13 +00:00
hughchen
14e0fe2707 Put newly discovered devices to the bottom of the list
Add two type SortType.TYPE_DEFAULT and SortType.TYPE_FIFO in BluetoothDevicePreference.
It needs to decide the sort type when you create the BluetoothDevicePreference.
TYPE_DEFAULT - According to the CacheBluetoothDevice state to sort
TYPE_FIFO - According to the timestamp to sort

Bug: 112546918
Test: make -j42 RunSettingsRoboTests
Change-Id: Icd25d9b76a44d5a105f8daf64e5bc1f9ead8cd92
2019-07-24 15:27:17 +08:00
Joshua Mccloskey
6c4c542fba Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979 am: 7e1e537e76
am: 2d4df16487

Change-Id: I0ee3e389d964f6777e6e174b13197daf7cb4faa2
2019-07-23 23:34:37 -07:00
Joshua Mccloskey
cbdfe9403e Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979 am: 436155ba91
am: f742e78e6f

Change-Id: I71e9e584819928d6c1bfee26d0a5373378ea6082
2019-07-23 23:15:57 -07:00
Joshua Mccloskey
2d4df16487 Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979
am: 7e1e537e76

Change-Id: I55a341a94cad27275457ab3a36116a8f788e83a2
2019-07-23 22:15:21 -07:00
Joshua Mccloskey
f742e78e6f Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979
am: 436155ba91

Change-Id: I4bdca0d0fe0cd5f38863eeb6975d026c424e6799
2019-07-23 22:14:08 -07:00
Lucas Lin
4eb82f912a Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c am: c30cdecfba am: e5cc01c3dc
am: 32bdab6035

Change-Id: Ib417c33dd6d0fdc23c9404abcf98e1cb5ecc28d7
2019-07-23 22:12:09 -07:00
Lucas Lin
32bdab6035 Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c am: c30cdecfba
am: e5cc01c3dc

Change-Id: Id15fc912e2d31b84c0a8ff5f28a92f11362f4056
2019-07-23 21:50:27 -07:00
Joshua Mccloskey
7e1e537e76 Merge "Add extra check for accessibility flow." into qt-r1-dev
am: c563fbb979

Change-Id: I0d84937b8029a8bdcec920123501fcb81f99f02f
2019-07-23 21:49:40 -07:00
Joshua Mccloskey
436155ba91 Merge "Add extra check for accessibility flow." into qt-r1-dev
am: c563fbb979

Change-Id: Ib0edf21c01d3e2086f61b80079e9efe5c2b231aa
2019-07-23 21:13:01 -07:00
Lucas Lin
e5cc01c3dc Merge "Create a string for private DNS "On"" am: a64f8d9521 am: 903e8dac6c
am: c30cdecfba

Change-Id: I0384e4169df9a0efa423a0f2bae783ee5212e5b8
2019-07-23 21:10:21 -07:00
Lucas Lin
c30cdecfba Merge "Create a string for private DNS "On"" am: a64f8d9521
am: 903e8dac6c

Change-Id: Id364ce04a54afe3abe8e9b240a6a6ed9864d5681
2019-07-23 20:56:43 -07:00
Lucas Lin
903e8dac6c Merge "Create a string for private DNS "On""
am: a64f8d9521

Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
2019-07-23 20:45:49 -07:00
Lucas Lin
a64f8d9521 Merge "Create a string for private DNS "On"" 2019-07-24 03:15:01 +00:00
Joshua Mccloskey
c563fbb979 Merge "Add extra check for accessibility flow." into qt-r1-dev 2019-07-23 23:54:38 +00:00
TreeHugger Robot
de70e24f47 Merge "Pass context for Starred Contacts Summary" 2019-07-23 23:54:04 +00:00
Bill Yi
cbfa8dfad1 [automerger skipped] Import translations. DO NOT MERGE am: fe36dd6834 -s ours
am: 7edf8eb90e -s ours
am skip reason: subject contains skip directive

Change-Id: I0a3b05a70fe25ef586654357f6936be53634b408
2019-07-23 15:27:36 -07:00
Bill Yi
7edf8eb90e [automerger skipped] Import translations. DO NOT MERGE
am: fe36dd6834 -s ours
am skip reason: subject contains skip directive

Change-Id: I21a0fe6886a4232bcb526dc8ade1dde41a7d0b72
2019-07-23 15:17:31 -07:00
Beverly
ea42ef17e6 Pass context for Starred Contacts Summary
So the correct context will be used to obtain the
correct translation for the summary string

Test: manual
Fixes: 138158873
Change-Id: I3d121fdfc7587870a86f7ad56f4efcbde664586d
2019-07-23 21:22:41 +00:00
Peiyong Lin
c2dfba01ca Remove prerelease driver option from Settings UI.
BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
2019-07-23 21:18:10 +00:00
Bill Yi
fe36dd6834 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I81487d87626426a7b7a969314691a6ce1177df4b
2019-07-23 13:19:18 -07:00
joshmccloskey
fae3193539 Add extra check for accessibility flow.
Bug: 138197084
Test: Verified other accessibility features like Live Transcribe does
not bring the user to the accessibility flow.
Test: Verified that the Sound Amplifier does not bring the user to
the accessibility flow.

Change-Id: I5131d74926c0b01c565da280c55afe0080855688
2019-07-23 19:13:08 +00:00
Yanting Yang
6c906dfaa7 Merge "Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d am: 920f6109a8" into qt-r1-dev-plus-aosp
am: 6a014082b6

Change-Id: I000e21b64c9d220e00440ffdb6dcaa3217c814bc
2019-07-23 09:57:13 -07:00
Yanting Yang
00c9114d88 Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d am: c453af3f91
am: 468e40e97c

Change-Id: Ie66c787f184a28facd20b3bba91553cdecd17194
2019-07-23 09:55:49 -07:00
Android Build Merger (Role)
6a014082b6 Merge "Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d am: 920f6109a8" into qt-r1-dev-plus-aosp 2019-07-23 16:47:17 +00:00
Yanting Yang
468e40e97c Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
am: c453af3f91

Change-Id: Iba9e810217cc4eee6c791eda6e3c100a851e9aa5
2019-07-23 09:46:44 -07:00
Yanting Yang
ed31ca806c Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
am: 920f6109a8

Change-Id: I22c607437953b5f87fa30d5f53715535ab2e363c
2019-07-23 09:46:43 -07:00
Yanting Yang
920f6109a8 Merge "Support new regulatory label for location" into qt-dev
am: 28736bee5d

Change-Id: I2a2fb86c5062f38b52ac38366c619aa8e0bb2f00
2019-07-23 09:37:45 -07:00
Yanting Yang
c453af3f91 Merge "Support new regulatory label for location" into qt-dev
am: 28736bee5d

Change-Id: I0a966698855aa935b6acbf3829988d5004ff57e2
2019-07-23 09:37:45 -07:00
TreeHugger Robot
28736bee5d Merge "Support new regulatory label for location" into qt-dev 2019-07-23 16:12:52 +00:00
lucaslin
be8701bca5 Create a string for private DNS "On"
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.

Bug: 79122154
Test: 1. Build pass
      2. make -j44 RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest

Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
2019-07-23 19:40:09 +08:00
TreeHugger Robot
e1f28f6ed7 Merge "Fix text format issue in the Accessibility magnification" 2019-07-23 11:12:36 +00:00
Sunny Shao
94276819c4 [automerger skipped] Merge "Use the date format to show the system update info" into qt-r1-dev am: a076039803
am: f67401a4c3 -s ours
am skip reason: change_id Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0 with SHA1 162e88c262 is in history

Change-Id: Ib9fc03bc8d81b7cb7640a6f82f386e5f78578cbf
2019-07-23 03:45:24 -07:00
Sunny Shao
f67401a4c3 Merge "Use the date format to show the system update info" into qt-r1-dev
am: a076039803

Change-Id: I12eab14b3a406348d13436df5843727f0dccf71d
2019-07-23 03:36:02 -07:00
TreeHugger Robot
a076039803 Merge "Use the date format to show the system update info" into qt-r1-dev 2019-07-23 10:07:36 +00:00
Yanting Yang
1303790f40 Fix text format issue in the Accessibility magnification
- Use getText() to apply html format to text view.
- Remove extra bullets from string.

Fixes: 138174003
Test: visual, robotests
Change-Id: Ia736087224d7a65ebe41ca2ac3fca7064a03f950
2019-07-23 17:37:31 +08:00
TreeHugger Robot
9f9acf6ff3 Merge "[Wi-Fi DPP] Refine code" 2019-07-23 01:51:01 +00:00
Mehdi Alizadeh
7833c334d7 Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev am: 66b0cabf26
am: 418f942c0e

Change-Id: I49e82fc0b16b920d2743dbbe61693e1a2302dfe7
2019-07-22 17:16:07 -07:00
Quang Luong
f73d65c940 Default MAC address should display "Not Available" in network details
For saved networks that do not have a MAC address available in their
WifiConfiguration such as Passpoint networks, the MAC address will
be the default value of 20:00:00:00:00:00. In this case, display
"Not Available" as the summary of the MAC address preference.

Bug: 137282522
Test: atest WifiDetailPreferenceControllerTest &&
manual - open saved passpoint network details while disconnected
but in range and observe MAC address preference.

Change-Id: Ie9010b0430726de8105852ae2afe10047dcc3676
2019-07-22 17:06:51 -07:00
Mehdi Alizadeh
418f942c0e Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
am: 66b0cabf26

Change-Id: I6ea0fe769b52345b8f148547d7950af9203c9926
2019-07-22 16:52:52 -07:00
Mehdi Alizadeh
66b0cabf26 Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev 2019-07-22 23:17:48 +00:00
Quang Luong
b470e725c9 Added WifiSettings -> WifiSettings2 redirection behind feature flag
Use WifiSettings2 if settings_wifitracker2 feature flag is enabled.
WifiSettings2 will be used for changes to WifiSettings to incorporate
the WifiTracker2 refactor.

Bug: 70983952
Test: make, set feature flag, open Wifi settings to verify new page
opens.

Change-Id: I08edc227bf38ab4b3b785180bf123815bf95da81
2019-07-22 14:41:11 -07:00
Bill Yi
5975ec43fa Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad -s ours am: 6e57d54d35 -s ours
am: be17e5a4e6 -s ours
am skip reason: subject contains skip directive

Change-Id: I3843be3bef455eea6e50f73aac2a968ccc9779fa
2019-07-22 13:48:25 -07:00