OSDN Git Service

android-x86/packages-apps-Settings.git
4 years ago[Settings] hide preferred network mode UI
Bonian Chen [Thu, 22 Aug 2019 09:13:06 +0000 (17:13 +0800)]
[Settings] hide preferred network mode UI

Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.

Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
      atest EnabledNetworkModePreferenceControllerTest
      Manual with AT&T SIM card in out of servce and in service

Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
Merged-In: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968

4 years agoMake EnabledNetworkModePreferenceController listen to setting changes
Antony Sargent [Tue, 30 Jul 2019 17:10:57 +0000 (10:10 -0700)]
Make EnabledNetworkModePreferenceController listen to setting changes

The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a

4 years agoMerge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
Paul Hu [Tue, 1 Oct 2019 09:50:28 +0000 (09:50 +0000)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"

4 years agoMerge "Fix to show eUICC preference in eng build"
Treehugger Robot [Thu, 26 Sep 2019 05:53:10 +0000 (05:53 +0000)]
Merge "Fix to show eUICC preference in eng build"

4 years agoMerge "In sim1 APN settings interface and hot plug out/in sim2, APN information chang...
Daniel Huang [Tue, 24 Sep 2019 09:21:51 +0000 (09:21 +0000)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"

4 years agoMerge "Enable dismissal feature on legacy suggestions."
Treehugger Robot [Mon, 23 Sep 2019 02:45:25 +0000 (02:45 +0000)]
Merge "Enable dismissal feature on legacy suggestions."

4 years agoEnable dismissal feature on legacy suggestions.
Yi-Ling Chuang [Thu, 19 Sep 2019 20:39:53 +0000 (13:39 -0700)]
Enable dismissal feature on legacy suggestions.

Add back the close button for legacy suggestions.

Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced

4 years agoIn sim1 APN settings interface and hot plug out/in sim2, APN information change to...
苗苗 (Miao Miao) [Tue, 17 Sep 2019 01:14:08 +0000 (09:14 +0800)]
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's

STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information

EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information

Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug: 141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.

4 years agoMerge "Remove use of deprecated Time class"
Treehugger Robot [Tue, 17 Sep 2019 16:32:47 +0000 (16:32 +0000)]
Merge "Remove use of deprecated Time class"

4 years agoRemove use of deprecated Time class
Neil Fuller [Tue, 17 Sep 2019 12:53:17 +0000 (13:53 +0100)]
Remove use of deprecated Time class

Remove a use of the deprecated Time class.

Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb

4 years ago[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
paulhu [Fri, 23 Aug 2019 09:18:58 +0000 (17:18 +0800)]
[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED

Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.

Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4

4 years agoFix to show eUICC preference in eng build
Taesu Lee [Mon, 22 Jul 2019 10:20:05 +0000 (19:20 +0900)]
Fix to show eUICC preference in eng build

DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.

Test: Manual and make RunSettingsRoboTests

Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
4 years agoMerge "DO NOT MERGE - Merge Android 10 into master"
Xin Li [Thu, 5 Sep 2019 16:53:18 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"

4 years agoDO NOT MERGE - Merge Android 10 into master
Xin Li [Wed, 4 Sep 2019 20:34:43 +0000 (13:34 -0700)]
DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963

4 years agoDO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Xin Li [Fri, 23 Aug 2019 06:45:17 +0000 (06:45 +0000)]
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master

Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11

4 years agoDO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
Xin Li [Fri, 23 Aug 2019 06:42:10 +0000 (06:42 +0000)]
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history

Bug: 139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9

4 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801...
Xin Li [Thu, 15 Aug 2019 07:25:54 +0000 (00:25 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am: 1e53efc4c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e

4 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002)...
Xin Li [Thu, 15 Aug 2019 06:32:21 +0000 (23:32 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am: c3ef16882d -s ours
am skip reason: subject contains skip directive

Change-Id: I1d1b46e30a9ec5b4e01f351342fe45ac64994d47

4 years agoMerge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
Treehugger Robot [Thu, 15 Aug 2019 06:13:48 +0000 (06:13 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"

4 years agoDO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
Xin Li [Wed, 14 Aug 2019 18:35:21 +0000 (11:35 -0700)]
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master

Bug: 134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d

4 years agoMerge "Allow radio info on phones with no subscription"
Jordan Liu [Wed, 14 Aug 2019 01:37:15 +0000 (18:37 -0700)]
Merge "Allow radio info on phones with no subscription"
am: 19d1f890a0

Change-Id: Ia63778cf83212b2670413e2567c068bf92f6ff05

4 years agoMerge "Allow radio info on phones with no subscription"
Jordan Liu [Wed, 14 Aug 2019 00:22:42 +0000 (00:22 +0000)]
Merge "Allow radio info on phones with no subscription"

4 years agoDO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Xin Li [Tue, 13 Aug 2019 23:36:39 +0000 (16:36 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master

Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520

4 years agoSnap for 5674421 from 4a949c0640373471f5699c7a5cf490731394c574 to pi-platform-release
android-build-team Robot [Tue, 13 Aug 2019 16:25:08 +0000 (16:25 +0000)]
Snap for 5674421 from 4a949c0640373471f5699c7a5cf490731394c574 to pi-platform-release

Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9

4 years agoAllow radio info on phones with no subscription
Jordan Liu [Wed, 7 Aug 2019 23:51:36 +0000 (16:51 -0700)]
Allow radio info on phones with no subscription

Some info is still helpful for debugging in these cases.

Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d

4 years agoMerge cherrypicks of [9007561, 9007562, 9007563, 9007600, 9007801, 9007895, 9007389...
android-build-team Robot [Sun, 28 Jul 2019 22:26:53 +0000 (22:26 +0000)]
Merge cherrypicks of [9007561900756290075639007600900780190078959007389] into qt-release

Change-Id: Ib68db973c7a9b5875ecd65bcb683793978020065

4 years agoDo not request cancel authentication unless currently authenticating
Kevin Chyn [Fri, 26 Jul 2019 18:20:10 +0000 (11:20 -0700)]
Do not request cancel authentication unless currently authenticating

Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
(cherry picked from commit 49c7d0765090750f88f11153dfcf9ec378b0c84d)

5 years agoMerge cherrypicks of [8828839, 8824129, 8828883, 8828885, 8828888, 8828891, 8829076...
android-build-team Robot [Thu, 25 Jul 2019 04:12:54 +0000 (04:12 +0000)]
Merge cherrypicks of [88288398824129882888388288858828888882889188290768828998882899988286078828957] into qt-release

Change-Id: Idb76a2a8d5818e896f2590513c27c9a42c55e8f8

5 years agoRemove prerelease driver option from Settings UI.
Peiyong Lin [Tue, 23 Jul 2019 17:27:47 +0000 (10:27 -0700)]
Remove prerelease driver option from Settings UI.

BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
(cherry picked from commit c2dfba01ca5dc94a00ed5d7b6aa2ba20759459fd)

5 years agoMerge "Create a string for private DNS "On""
Lucas Lin [Wed, 24 Jul 2019 03:45:49 +0000 (20:45 -0700)]
Merge "Create a string for private DNS "On""
am: a64f8d9521

Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b

5 years agoMerge "Create a string for private DNS "On""
Lucas Lin [Wed, 24 Jul 2019 03:15:01 +0000 (03:15 +0000)]
Merge "Create a string for private DNS "On""

5 years agoMerge cherrypicks of [8738218, 8738219, 8738140, 8736270, 8736271, 8736272, 8732114...
android-build-team Robot [Wed, 24 Jul 2019 02:22:47 +0000 (02:22 +0000)]
Merge cherrypicks of [873821887382198738140873627087362718736272873211487384958738319873674387383208738496] into qt-release

Change-Id: I64ad4e8161a96e4cc2e28ad24bd988894892910c

5 years agoSupport new regulatory label for location
Yanting Yang [Thu, 18 Jul 2019 17:46:36 +0000 (01:46 +0800)]
Support new regulatory label for location

Fixes: 137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
(cherry picked from commit 49b1bc15450d823e86ee4b2b77d77dc9eeca388e)

5 years agoCreate a string for private DNS "On"
lucaslin [Tue, 23 Jul 2019 11:40:09 +0000 (19:40 +0800)]
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

5 years agoMerge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886...
android-build-team Robot [Fri, 12 Jul 2019 04:11:18 +0000 (04:11 +0000)]
Merge cherrypicks of [8558068855882585588268558827855710985580188558886855888785588888558889855807185580728556231] into qt-release

Change-Id: Id07c91777f0b9ff3283ff1dfc53b5e1680c5f2f0

5 years agoFix erasing of eSIMs for some devices
Antony Sargent [Thu, 11 Jul 2019 18:04:09 +0000 (11:04 -0700)]
Fix erasing of eSIMs for some devices

Doing a factory data reset used to always erase eSIMs. Then a few months
ago we added a default-on checkbox to let users opt out of erasing the
eSIM during this process, but only had it show for some devices (ones
which support the "fastboot oem esim_erase" command) by adding a system
property named masterclear.allow_retain_esim_profiles_after_fdr.

When recently updating the strings shown in the factory data reset
screen and the confirmation dialog, we changed the code so that if that
the checkbox is hidden we'll pass false for the ERASE_ESIMS_EXTRA
parameter sent to the factory data reset confirmation dialog. This had
the unintended side effect of making devices that don't specify true for
masterclear.allow_retain_esim_profiles_after_fdr skip erasing the eSIM.

This CL fixes that by removing the "is the checkbox hidden" check, going
back to the previous behavior of just using the checkbox value, which is
on by default even if hidden.

Fixes: 135284765
Test: make RunSettingsRoboTests
Change-Id: Ia9f335920e4e3c4a90f0a6a49d1722a0c19ea83d
(cherry picked from commit 5f612a4b442494d08259a976eccb7192ffa0c534)

5 years agoMerge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808, 8549876...
android-build-team Robot [Thu, 11 Jul 2019 19:50:24 +0000 (19:50 +0000)]
Merge cherrypicks of [854982085496688549613854961485499358549808854987685498098549552] into qt-release

Change-Id: I9d4e0032c124831e73c042f5b7e263a6ab7fb740

5 years agoImprove Settings launch performance
tmfang [Wed, 3 Jul 2019 12:44:42 +0000 (20:44 +0800)]
Improve Settings launch performance

From traces analysis, we found getFreeBytes
was taking a long time to return.

getFreeBytes was used when storage controller
tried to get storage information.

In order to prevent this case, we put the action
which takes too much time in background thread.

Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes: 136268875

Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit 0c37f019f61f37b67e2297e99d96e8396d962f40)

5 years ago[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705...
Xin Li [Thu, 11 Jul 2019 01:44:45 +0000 (18:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
am: 0c7e805902 -s ours
am skip reason: subject contains skip directive

Change-Id: I724db7670844b89aaae1e9bc856c16c95209b14e

5 years agoMerge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
Treehugger Robot [Thu, 11 Jul 2019 00:56:33 +0000 (00:56 +0000)]
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"

5 years agoSnap for 5716396 from 13d6e13166af767036baec091a6781c3d1aa15b9 to qt-release
android-build-team Robot [Wed, 10 Jul 2019 03:42:19 +0000 (03:42 +0000)]
Snap for 5716396 from 13d6e13166af767036baec091a6781c3d1aa15b9 to qt-release

Change-Id: Ib07c520516900525ecd18f1f04c657bcc7ce06e6

5 years agoDO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
Xin Li [Tue, 9 Jul 2019 22:31:44 +0000 (15:31 -0700)]
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master

Bug: 136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 Jul 2019 18:46:23 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925

5 years agoSnap for 5713174 from 292e7ad1104f8612151f0482420a6f5888e33b13 to qt-release
android-build-team Robot [Tue, 9 Jul 2019 02:57:17 +0000 (02:57 +0000)]
Snap for 5713174 from 292e7ad1104f8612151f0482420a6f5888e33b13 to qt-release

Change-Id: Ie17a2f13b775ea666400306afee8d12cdf9dec5c

5 years agoSnap for 5622519 from fd365ae91ebe924197c5f443c889928eb07bd02c to pi-platform-release
android-build-team Robot [Mon, 8 Jul 2019 23:29:58 +0000 (23:29 +0000)]
Snap for 5622519 from fd365ae91ebe924197c5f443c889928eb07bd02c to pi-platform-release

Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 6 Jul 2019 02:04:54 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 292e7ad110 -s ours
am skip reason: subject contains skip directive

Change-Id: I10718d202f97e6fb1d6c7855c50ae5e15d4e5278

5 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 5 Jul 2019 21:38:28 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e

5 years agoSnap for 5706892 from a0fb9000bb878bdf6b4824d1e286d8c652fe3e31 to qt-release
android-build-team Robot [Thu, 4 Jul 2019 02:58:25 +0000 (02:58 +0000)]
Snap for 5706892 from a0fb9000bb878bdf6b4824d1e286d8c652fe3e31 to qt-release

Change-Id: If19f709d9b070496081c3ea25ab531c6bff9f6ea

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Wed, 3 Jul 2019 23:19:58 +0000 (16:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: a0fb9000bb -s ours
am skip reason: subject contains skip directive

Change-Id: I53bbafb3bcf25c01d4b1bc45edb66398ca900e91

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 3 Jul 2019 06:30:20 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41

5 years agoMerge "Add tobiast@ to the OWNERS file" am: a931693721
Neil Fuller [Tue, 2 Jul 2019 22:32:40 +0000 (15:32 -0700)]
Merge "Add tobiast@ to the OWNERS file" am: a931693721
am: 46e53e770c

Change-Id: I9229928c7e9895003869752df1602ed26b42b90e

5 years agoMerge "Add tobiast@ to the OWNERS file"
Neil Fuller [Tue, 2 Jul 2019 17:13:36 +0000 (10:13 -0700)]
Merge "Add tobiast@ to the OWNERS file"
am: a931693721

Change-Id: Id52f2dcd3755f4fbbd6f6918e993063aebc582ac

5 years ago[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924...
Xin Li [Tue, 2 Jul 2019 17:04:54 +0000 (10:04 -0700)]
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 0a68e9bfe7 -s ours
am skip reason: subject contains skip directive

Change-Id: I075c4d89765d09a570e0150e486e85dc78772afc

5 years agoMerge "Add tobiast@ to the OWNERS file"
Neil Fuller [Tue, 2 Jul 2019 14:27:55 +0000 (14:27 +0000)]
Merge "Add tobiast@ to the OWNERS file"

5 years agoAdd tobiast@ to the OWNERS file
Neil Fuller [Tue, 2 Jul 2019 09:55:24 +0000 (10:55 +0100)]
Add tobiast@ to the OWNERS file

Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.

Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36

5 years agoSnap for 5702458 from 26a2694bd383ec113298f98695e4a4060fcbc094 to qt-release
android-build-team Robot [Tue, 2 Jul 2019 04:30:03 +0000 (04:30 +0000)]
Snap for 5702458 from 26a2694bd383ec113298f98695e4a4060fcbc094 to qt-release

Change-Id: Ifeae76d0bea60dca5dcfb29ff8358e2ca04511f0

5 years agoDO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Xin Li [Mon, 1 Jul 2019 21:00:04 +0000 (21:00 +0000)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master

Bug: 134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Mon, 1 Jul 2019 09:42:17 +0000 (02:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 26a2694bd3 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c83a096d556894ace12a767de72ba62f6f3f587

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 30 Jun 2019 21:58:27 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0

5 years agoSnap for 5698743 from 72aded338a5ffb6e22cbee8faf1da70221183040 to qt-release
android-build-team Robot [Sat, 29 Jun 2019 23:05:08 +0000 (23:05 +0000)]
Snap for 5698743 from 72aded338a5ffb6e22cbee8faf1da70221183040 to qt-release

Change-Id: I7b33e1bba4dcfcd626adbc27eb40d4fc95e3af6b

5 years agoMerge "Add UI for mainline modules licenses." into qt-dev
Andrew Sapperstein [Fri, 28 Jun 2019 17:28:07 +0000 (10:28 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7

5 years agoMerge "Add UI for mainline modules licenses." into qt-dev
Andrew Sapperstein [Fri, 28 Jun 2019 16:56:04 +0000 (16:56 +0000)]
Merge "Add UI for mainline modules licenses." into qt-dev

5 years agoMerge "Adding unique task affinity for FallbackHome activity" into qt-dev
Winson Chung [Thu, 27 Jun 2019 23:24:53 +0000 (16:24 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am: 9591c3f963

Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77

5 years agoMerge "Adding unique task affinity for FallbackHome activity" into qt-dev
Winson Chung [Thu, 27 Jun 2019 22:47:14 +0000 (22:47 +0000)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev

5 years agoSnap for 5691606 from 5a69fac6945317629bf856519803f675ef34b8db to qt-release
android-build-team Robot [Thu, 27 Jun 2019 03:09:11 +0000 (03:09 +0000)]
Snap for 5691606 from 5a69fac6945317629bf856519803f675ef34b8db to qt-release

Change-Id: I4d441da970e4d09a0e8878a87ccd26ed3438601e

5 years agoAdding unique task affinity for FallbackHome activity
Louis Chang [Thu, 27 Jun 2019 01:57:54 +0000 (09:57 +0800)]
Adding unique task affinity for FallbackHome activity

Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.

Bug: 135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec

5 years agoMerge "Fixed the IllegalStateException on removing account" into qt-dev
Sunny Shao [Wed, 26 Jun 2019 11:35:26 +0000 (04:35 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
am: 5a69fac694

Change-Id: I6d87742bd0925237cb73171561118e4bdd363b8a

5 years agoMerge "Fixed the IllegalStateException on removing account" into qt-dev
TreeHugger Robot [Wed, 26 Jun 2019 11:15:35 +0000 (11:15 +0000)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev

5 years agoMerge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
Antony Sargent [Wed, 26 Jun 2019 06:02:14 +0000 (23:02 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am: 3288037bd2

Change-Id: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f

5 years agoMerge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
TreeHugger Robot [Wed, 26 Jun 2019 05:35:29 +0000 (05:35 +0000)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev

5 years agoSnap for 5688376 from 87fadeeb4a2352a1fc2de303be525d12c1d66089 to qt-release
android-build-team Robot [Wed, 26 Jun 2019 03:04:05 +0000 (03:04 +0000)]
Snap for 5688376 from 87fadeeb4a2352a1fc2de303be525d12c1d66089 to qt-release

Change-Id: Id06481c506e326dae5bcfdd3099126e9e8c511ff

5 years agoAdd UI for mainline modules licenses.
Andrew Sapperstein [Tue, 18 Jun 2019 16:44:18 +0000 (09:44 -0700)]
Add UI for mainline modules licenses.

Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.

Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.

Fixes: 135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8

5 years agoCheck isWfcProvisionedOnDevice in WifiCallingSettings
Antony Sargent [Tue, 25 Jun 2019 21:01:36 +0000 (14:01 -0700)]
Check isWfcProvisionedOnDevice in WifiCallingSettings

On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.

The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.

What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.

The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.

As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.

Fixes: 135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2

5 years agoMerge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
Antony Sargent [Tue, 25 Jun 2019 18:40:48 +0000 (11:40 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am: 87fadeeb4a

Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed

5 years agoMerge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
TreeHugger Robot [Tue, 25 Jun 2019 17:54:54 +0000 (17:54 +0000)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Tue, 25 Jun 2019 15:57:36 +0000 (08:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 279050c8d6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibef4696cf7a55802d4a3edf66d0fb222b9089c1a

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Tue, 25 Jun 2019 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoSnap for 5685999 from 32d16291defb2e67f7d657215ad45666323f2f6c to qt-release
android-build-team Robot [Tue, 25 Jun 2019 12:42:29 +0000 (12:42 +0000)]
Snap for 5685999 from 32d16291defb2e67f7d657215ad45666323f2f6c to qt-release

Change-Id: I64f90b9c7fbb0a215d0210f4bcf293516591917c

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 25 Jun 2019 11:07:28 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55

5 years agoMerge "Adds metrics categories for gesture navigation dialogs" into qt-dev
Mehdi Alizadeh [Tue, 25 Jun 2019 00:36:26 +0000 (17:36 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am: 32d16291de

Change-Id: I96cbfd9d4e7b3b96f6977958861ae913dfa5e8ec

5 years agoMerge "Adds metrics categories for gesture navigation dialogs" into qt-dev
Mehdi Alizadeh [Tue, 25 Jun 2019 00:09:06 +0000 (00:09 +0000)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev

5 years agoMerge "Revert "Add special apps access settings page for financial app."" into qt-dev
Hai Zhang [Mon, 24 Jun 2019 21:28:54 +0000 (14:28 -0700)]
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
am: b39810f5ab

Change-Id: I8ab0452cd656d25afe164dec49553512decfdcec

5 years agoMerge "Revert "Add special apps access settings page for financial app."" into qt-dev
TreeHugger Robot [Mon, 24 Jun 2019 21:19:17 +0000 (21:19 +0000)]
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev

5 years agoRevert "Add special apps access settings page for financial app."
Hai Zhang [Fri, 21 Jun 2019 20:54:29 +0000 (20:54 +0000)]
Revert "Add special apps access settings page for financial app."

This reverts commit 43374eabb8669b79c734da49177b9ed1a7651237.

Reason for revert: No longer needed because we are using whitelist for
SMS permission

Fixes: 135213238
Test: presubmit
Change-Id: I182be4a1136521f325866e70e875439c17816ef2

5 years agoAdds metrics categories for gesture navigation dialogs
Mehdi Alizadeh [Fri, 21 Jun 2019 01:12:11 +0000 (18:12 -0700)]
Adds metrics categories for gesture navigation dialogs

Bug: 135211145
Test: Builds
Change-Id: I9231778072bb222142fca09275cd84b87a263fa6

5 years agoMerge "Fix Dark theme case" into qt-dev
Fabian Kozynski [Mon, 24 Jun 2019 19:49:38 +0000 (12:49 -0700)]
Merge "Fix Dark theme case" into qt-dev
am: 5bfb9f3240

Change-Id: I3970a16198bb1d023fdd62840e7078883d4726c5

5 years agoMerge "Fix Dark theme case" into qt-dev
Fabian Kozynski [Mon, 24 Jun 2019 19:03:16 +0000 (19:03 +0000)]
Merge "Fix Dark theme case" into qt-dev

5 years agoAdd a listener for subscription changes to SimDialogFragment
Antony Sargent [Wed, 19 Jun 2019 18:30:33 +0000 (11:30 -0700)]
Add a listener for subscription changes to SimDialogFragment

For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.

But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.

Fixes: 135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
(cherry picked from commit 6a1d7e60ac3593ce46c12dab0066a10149ca4aac)

5 years agoFix Dark theme case
Fabian Kozynski [Mon, 24 Jun 2019 14:07:17 +0000 (10:07 -0400)]
Fix Dark theme case

Test: manual
Fixes: 135711083
Change-Id: I91941466b98bbb08d17897784d90a4f467b4de5f

5 years agoSnap for 5681426 from ab63fd3c25f8cdc6510bb815a9e6e33ff06ec132 to qt-release
android-build-team Robot [Sat, 22 Jun 2019 23:17:03 +0000 (23:17 +0000)]
Snap for 5681426 from ab63fd3c25f8cdc6510bb815a9e6e33ff06ec132 to qt-release

Change-Id: I88f1916c31f749519688d7c94fee47a9d12c7df8

5 years agoRemove dead code
Julia Reynolds [Fri, 21 Jun 2019 17:15:12 +0000 (10:15 -0700)]
Remove dead code
am: ab63fd3c25

Change-Id: Ie0ff97b0db868f4f5aff19c4d8da2a8fc2a5717d

5 years agoRemove dead code
Julia Reynolds [Thu, 20 Jun 2019 12:51:11 +0000 (08:51 -0400)]
Remove dead code

Test: try to search 'gentle'
Fixes: 135640138
Change-Id: If03703e59f77206da08fc80e88bb986f821c18fe

5 years agoFix Settings crash when trying to show work policy info
Ivan Podogov [Thu, 20 Jun 2019 22:34:39 +0000 (15:34 -0700)]
Fix Settings crash when trying to show work policy info
am: 242ff568d1

Change-Id: I2a048e75934dda54d4b495908f07016e9c00b674

5 years agoFix Settings crash when trying to show work policy info
Ivan Podogov [Thu, 20 Jun 2019 15:01:29 +0000 (16:01 +0100)]
Fix Settings crash when trying to show work policy info

This fixes an exception in startActivity() call:

"android.util.AndroidRuntimeException: Calling startActivity() from outside of
an Activity  context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really
what you want?"

Bug: 132904820
Test: manual
Change-Id: I0c687ea76068778554b072b6cc8274352de6fa28

5 years agoMerge "Cannot switch between multiple TTS engines" into qt-dev
Raff Tsai [Thu, 20 Jun 2019 05:57:25 +0000 (22:57 -0700)]
Merge "Cannot switch between multiple TTS engines" into qt-dev
am: 753215fff9

Change-Id: I5d399c7f653caf53041f1136948f4a8de457d7c5

5 years agoMerge "Cannot switch between multiple TTS engines" into qt-dev
TreeHugger Robot [Thu, 20 Jun 2019 04:42:23 +0000 (04:42 +0000)]
Merge "Cannot switch between multiple TTS engines" into qt-dev

5 years agoSnap for 5674462 from d64b6c88465b7c737983fc40186e079fe8d85ed3 to qt-release
android-build-team Robot [Thu, 20 Jun 2019 03:04:37 +0000 (03:04 +0000)]
Snap for 5674462 from d64b6c88465b7c737983fc40186e079fe8d85ed3 to qt-release

Change-Id: Ic4fbcd54ada1df8c98c43386873d67539c84a0f1

5 years agoMerge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail"...
Arc Wang [Thu, 20 Jun 2019 02:38:57 +0000 (19:38 -0700)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
am: d64b6c8846

Change-Id: Icfa3b21e383182a127a1e633a671013c371ab105

5 years agoMerge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail"...
Arc Wang [Thu, 20 Jun 2019 01:34:09 +0000 (01:34 +0000)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev

5 years agoMerge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
Arc Wang [Wed, 19 Jun 2019 17:14:55 +0000 (10:14 -0700)]
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
am: d8916ef151

Change-Id: I360ff827ae8544d76c4411410172ace81bbcef56