PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,019 Commits 1 Branch 0 Tags
8e2ecd5918abda3f3399341e1f8500d090b901b2
Commit Graph

79019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
e632315dc8 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1 am: 8677c6a4b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66d08a63a109ef4e4a14c266773266b216b17f5b
 2021-01-06 05:19:19 +00:00
Treehugger Robot
8677c6a4b7 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4f151b07b92e0c55a53b38216024858b9fd68ce
 2021-01-06 04:57:58 +00:00
Treehugger Robot
d3d0962cd1 Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" 2021-01-06 04:24:25 +00:00
TreeHugger Robot
7ad74ff413 Merge "Remove org.apache.http.legacy from Settings" 2021-01-06 03:51:42 +00:00
TreeHugger Robot
087613f50b Merge "Night display setting should be toggleable" 2021-01-06 02:30:03 +00:00
Weng Su
e9f4928ef1 [Provider Model] Internet Panel UI update 
- Add gear icon to connected non-carrier network

- Update "View airplane mode networks" wording

- Update "Turn off airplane mode" wording

- Check WiFi disable to show airplane mode message

- Screenshot
  https://screenshot.googleplex.com/BRjcKyMaMS4ujYN

Bug: 173413889
Test:
- Manual Test
- adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY

Change-Id: Icf7b77e514cffa68cf103dbc9e7df93d58f9f762
 2021-01-06 02:11:46 +00:00
Jason Jeremy Iman
620158be52 [adb-wireless] Allow ADB-over-WiFi when WiFi is not default 
When other network types with higher priority than wifi is
connected alongside wifi, turning on ADB over wifi is not
possible.

This is happening due to `isWifiConnected()` only checks
if wifi is the default network and not if wifi is connected.

Often times multiple networks such as ethernet is used in
conjuction with wifi, making ADB over wifi not working with
the setup.

Fix by returning if any available network is a WiFi network.

Bug: 173466085
Test: Tested on eve Chrome OS ARCVM, ADB WiFi can be toggled when
      WiFi is not the default network.

Change-Id: I8474a4e8b37a4af0031e1462645509f1e634e9a8
 2021-01-06 11:00:03 +09:00
Edgar Wang
fc02ce1c20 Refactor AppPreference and AppSwitchPreference 
- Move AppSwitchPreference
- Remove FeatureflagPreference summary

Bug: 176815722
Test: robotest
Change-Id: Id337097f237ac9ca6dfa01665df61b1258dc24f2
 2021-01-05 18:27:08 +00:00
Michael Wachenschwanz
d127eb017c Add getScreenOnEnergy to FakeUid 
Bug: 172361024
Test: builds
Change-Id: I968bae76d2cc8bfc718057466320095cb4eeac2f
 2021-01-05 10:06:49 -08:00
Alex Johnston
c850920cc6 Call KeyChain credential management app APIs Settings 
Background
* This is part of the work to support
  a credential management app on
  unmanaged devices.
Changes
* Add calls to KeyChain credential management
  app API methods.
* Add logic to add, update and remove credential
  management app from KeyChain.

Manual Testing
* Install TestDPC
* Request to manage credentials (fire intent).
  Add policy mapping: 'com.android.chrome' ->
  'client.badssl.com:443' -> 'testAlias'
* Install badssl user certificate as credential
  management app (TestDPC). Set alias to 'testAlias'
* Check certificate is installed in Settings
* Go to chrome > client.badssl.com
* Verify no certificate selection prompt is
  displayed. User is automatically authenticated.
* Remove credential management app from Settings
  Security > Encryption and credentials >
  Certificate management app
* Verify credential management app is removed and
  'testAlias' is uninstalled.

Bug: 165641221
Test: Manual Testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.RequestManageCredentialsTest
Change-Id: I52254ccbdb0b46941b35130d487e0cf346212968
 2021-01-05 16:57:50 +00:00
Weng Su
5e76c02d82 [Provider Model] Implement the carrner network selection settings 
- Add WifiPickerTrackerHelper to reuse the library

- User taps on carrier network preference
  - Calls MergedCarrierEntry#connect()

- User toggles mobile data On/Off
  - Calls MergedCarrierEntry#setEnabled(true/false)

Bug: 175761096
Test:
- Manual Test
- atest NetworkMobileProviderControllerTest \
        SubscriptionsPreferenceControllerTest \
        WifiPickerTrackerHelperTest

Change-Id: Ia311b10ca7a44a536556c1889ee65743af379822
 2021-01-05 15:05:24 +00:00
TreeHugger Robot
26474eb02f Merge "Add adaptive charging to the top level settings menu" 2021-01-05 10:45:33 +00:00
Tsung-Mao Fang
010ab29eb1 Night display setting should be toggleable 
Based on Android S design, we want to let user can toggle
night light in display settings page directly.

1. Use primary switch preference in xml file.
2. Add a switch toggle controler for its preference.
3. Move logic of night display preference to controler.
4. Remove the night display preference since we migrate the logic to
controller.

Test: Night display works as intented behavior.
Bug: 174964139
Change-Id: Id920033cb22b1a9dd42c77c6fc2563ddae96bfcd
 2021-01-05 17:55:37 +08:00
SongFerng Wang
fdc148ea98 Merge "Change provider model slice's wording" 2021-01-05 06:04:37 +00:00
SongFerngWang
114b6c496e Change provider model slice's wording 
Bug: 176457592
Test: Build pass and manual test(review UI wording)
Change-Id: I66361cc6830aea96c55cdef737a9c5c3b8bd1b47
 2021-01-05 12:25:45 +08:00
Stephane Lee
b60870cb7d Add adaptive charging to the top level settings menu 
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: Iba2d81e779e2b4aaa3c7b7c38710a03c6792c4a9
 2021-01-04 15:37:21 -08:00
TreeHugger Robot
88d1033150 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d2a2867d85 -s ours am: 8e18b5b69d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa4c9f4eb78b442cbee8ae7f4e7a54b049757970
 2021-01-03 05:42:21 +00:00
Bill Yi
02d99e5346 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783c18d8a6 -s ours am: 7c77e36579 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I848b35574563ea747884ced888fd81a6974410b6
 2021-01-03 05:42:04 +00:00
TreeHugger Robot
8e18b5b69d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d2a2867d85 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
 2021-01-03 05:24:18 +00:00
Bill Yi
7c77e36579 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783c18d8a6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife1751f97a9e4a80f9af2981ae626382bcb2aca3
 2021-01-03 05:24:11 +00:00
TreeHugger Robot
d2a2867d85 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-01-03 05:10:18 +00:00
Bill Yi
88409f1af9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I838570051ce2aab9c2b98fb2bf738a06b7687893
 2021-01-02 22:27:59 +00:00
Bill Yi
783c18d8a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc84cbad5cb80898de5f771c8e1defd43122d694
 2021-01-02 21:59:25 +00:00
TreeHugger Robot
1a72e7b875 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c045ccdc5a -s ours am: 156857c2e0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13282324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5be2b182b387e37b99dcffc23cd1ce67835d9965
 2021-01-02 18:40:03 +00:00
TreeHugger Robot
156857c2e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c045ccdc5a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13282324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74a9fab4956fed3f808d28e110c300de403bdb2c
 2021-01-02 18:21:51 +00:00
TreeHugger Robot
c045ccdc5a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-01-02 18:05:17 +00:00
Bill Yi
73a4ed09db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee457eea5 -s ours am: 6c25b86023 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56a6fae096f5036e967f055845ca74842dc4717e
 2021-01-02 04:47:53 +00:00
Treehugger Robot
c76b627c88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce -s ours am: aae7ce1b1c -s ours am: b441429a8f -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie704be56ec602a6163f5a44054ffe589389878f5
 2021-01-02 04:47:47 +00:00
Treehugger Robot
62d81e1712 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c -s ours am: ed32f93dbd -s ours am: a6ed699018 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I588de92c0f984f0848bb5b48a4f2fa06980d1378
 2021-01-02 04:47:27 +00:00
Bill Yi
6c25b86023 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee457eea5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff609972087838e5cbdd1f01b64598456edc2e4f
 2021-01-02 04:29:13 +00:00
Treehugger Robot
b441429a8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce -s ours am: aae7ce1b1c -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c5788675875037a68a77308b1bb61eea802e32d
 2021-01-02 04:21:27 +00:00
Treehugger Robot
a6ed699018 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c -s ours am: ed32f93dbd -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie98a3ecc9281eca2f3631fe6a779bf8fd8a313a0
 2021-01-02 04:21:22 +00:00
Treehugger Robot
aae7ce1b1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64108906b14421f342bb5418d800a4b639a43708
 2021-01-02 03:33:25 +00:00
Treehugger Robot
ed32f93dbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a22c4edab65206bd4441d791c19fda687276057
 2021-01-02 03:33:06 +00:00
Treehugger Robot
30364048ce Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:14:44 +00:00
Treehugger Robot
f89dd1307c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:14:05 +00:00
Bill Yi
502f111677 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie47dac2298ca18d01ea7d1319eab3a9dd221d191
 2021-01-01 18:34:16 -08:00
Bill Yi
dee457eea5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I32232511655da9fe89308d73e084412957f3d03d
 2021-01-01 17:46:51 -08:00
Bill Yi
3e0563138f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I31a8c787f06f10c5c985268ea2652dff6d3161ff
 2021-01-01 22:26:03 +00:00
Bill Yi
028d6f33b5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1f949c9281dc4a209ff3ccd84f74423fd92ebb6
 2021-01-01 21:57:18 +00:00
TreeHugger Robot
6653b25aaa Merge "Revert "Add Hotspot WPA3 Settings"" 2021-01-01 00:00:47 +00:00
bsears
598ab32345 Revert "Add Hotspot WPA3 Settings" 
This reverts commit e0062af10c.

Reason for revert: Bug 176569060 - Droidfood blocking crash in Settings app.

Change-Id: Id50c96e8ce704b19e5ffb9b9a9fcbb0db2d81aee
 2020-12-31 21:16:51 +00:00
TreeHugger Robot
e494f11ba7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-31 18:35:30 +00:00
Bill Yi
831a1a69a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ief81693c1d68c4ea6db68ae0a6a2ec33c2ce4fb9
 2020-12-31 08:26:32 -08:00
Jason Hsu
2e01c93c45 Merge "Extract magnification capabilities from MagnificationSettingsFragment into a new class." 2020-12-31 09:04:14 +00:00
Hugh Chen
085f70d48d RESTRICT AUTOMERGE Update String 
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
 2020-12-30 18:35:03 -08:00
Hugh Chen
8ecca02ece RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message 
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
 2020-12-30 18:34:43 -08:00
Hugh Chen
19aeca103d RESTRICT AUTOMERGE Update String 
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
 2020-12-30 18:34:05 -08:00
Hugh Chen
bbe765f992 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message 
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
 2020-12-30 18:33:52 -08:00
Hugh Chen
ccbe74f555 RESTRICT AUTOMERGE Update String 
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
 2020-12-30 18:33:12 -08:00