PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,261 Commits 1 Branch 0 Tags
4b302a166e81de17f1c6e24f4b827eb9b82dc6cc
Commit Graph

80261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hugh Chen
01a50db645 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:32:58 -08:00
Hugh Chen
48ec74592d RESTRICT AUTOMERGE Update String 
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
 2020-12-30 18:31:39 -08:00
Hugh Chen
9037e43fa8 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:31:22 -08:00
Peter Kalauskas
0fa7edbb02 Update icons and text for guest user 
Test: As Guest, open Settings > System > Multiple users
Test: As Owner, open Settings > System > Multiple users
Bug: 169783558
Change-Id: I42c0b46fd895267b7556f3f308957b6dd17d92c4
 2020-12-30 17:43:14 -08:00
jasonwshsu
f30eded170 Extract magnification capabilities from MagnificationSettingsFragment into a new class. 
* To increase single responsibility of MagnificationSettingsFragment

Bug: 168567356
Test: atest MagnificationCapabilitiesTest
Change-Id: Ic5e8a556858ac2b6ab9929b1bbdc373ce320c270
 2020-12-30 19:40:43 +08:00
Weng Su
b6a5141953 Merge "Add Hotspot WPA3 Settings" 2020-12-30 03:09:00 +00:00
TreeHugger Robot
65ced1482d Merge "Revert "Add adaptive charging to the top level settings menu"" 2020-12-29 20:08:25 +00:00
Amber Ogata
89d81de62e Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c am: 25ff810ef9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ab15b83fbd574e6db202a7cc2eab1be461597a3
 2020-12-29 18:20:56 +00:00
Amber Ogata
25ff810ef9 Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib87255a28d45127a68eea13b217e169fcfbba0cd
 2020-12-29 18:05:57 +00:00
Daniel Chapin
2f51836ca1 Revert "Add adaptive charging to the top level settings menu" 
Revert submission 12989357-fix_ac_menu

Reason for revert: Bug: 176473169
Reverted Changes:
I6fc50a5ae:Add adaptive charging to the top level settings me...
I8f600287c:Add adaptive charging to the top level settings me...

Change-Id: I2928a96112bb8d2beeb071f231af6595edead4fa
 2020-12-29 17:55:13 +00:00
Amber Ogata
ac0f1fc20c Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424f31e085814e4afd0b92d3295d25301febf5ca
 2020-12-29 17:29:57 +00:00
Amber Ogata
4de1ae6a45 Merge "Add intent filter to open premium sms setting." 2020-12-29 17:01:04 +00:00
TreeHugger Robot
c0cbcb9f04 Merge "Add test cases for ToggleAutoclickPreferenceController." 2020-12-29 15:20:02 +00:00
Tom Hsu
36ecdd496c Merge "[Provider model] Internet picker Part II" 2020-12-29 14:23:14 +00:00