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
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
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
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
Peter_Liang
c7c1e7d442
Add test cases for ToggleAutoclickPreferenceController.
...
Bug: 168567356
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ToggleAutoclickPreferenceControllerTest
Change-Id: I4ea1089ddc9aad8748b950c38617533dc1d5cb02
2020-12-29 21:41:14 +08:00
Weng Su
8b1989cdcc
Merge "[Provider Model] Implement the carrner network selection"
2020-12-29 13:13:16 +00:00
tom hsu
65f8aa2f7b
[Provider model] Internet picker Part II
...
- Add mobile internet preference with default data subscription.
- Make prefrence to show dynamically when data subscription changed.
Video exhibition
- http://rcll/gcmsphfhJ1UzfPSvjWOuXK/c1B2CtaFz27rlIQ2LSTJmo
Code difference
- SubscriptionsPreferenceControllerTest.java between robolectric and junit.
- https://diff.googleplex.com/#key=1Zm7JGPhoZwY
Bug: 172229552
Test: atest SubscriptionsPreferenceControllerTest
Change-Id: Ib50c2c51159f60f19631d1a02081eafde3436e94
2020-12-29 19:48:21 +08:00
Treehugger Robot
581573f0d7
Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6
am: defe0a6b9f
am: 8dc014e909
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I077de332388b35b1177853d0f590ae0b4ea7d29f
2020-12-29 09:41:38 +00:00
Treehugger Robot
8dc014e909
Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6
am: defe0a6b9f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia74c0bea83aa76c4b8aa453a190bebe8041eafed
2020-12-29 09:27:29 +00:00
Treehugger Robot
defe0a6b9f
Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e57028b2b4cabaa7bd9aaac6a134b54af5b3116
2020-12-29 08:57:36 +00:00
Treehugger Robot
a1716edbb6
Merge "hardwareinfo: Hide hardware revision if empty"
2020-12-29 08:21:35 +00:00
Weng Su
e0062af10c
Add Hotspot WPA3 Settings
...
- Add WPA3 SAE security types
- "WPA3-Personal"
- "WPA2/WPA3-Personal"
- Verify valid WPA3 password
- Enable QR code scanner for Hotspot WPA3
- Screenshot
https://screenshot.googleplex.com/B6u54wh8w35Xnyf
https://screenshot.googleplex.com/8hWHHUTb6UaS9vB
Bug: 167968488
Test:
- Manual Test
- atest WifiTetherSecurityPreferenceControllerTest
- atest WifiUtilsTest
Change-Id: I155ed0bfd187d27ba864f9fb1b78d08c437740f3
2020-12-29 08:04:10 +00:00
Treehugger Robot
ba98c52ce3
Merge "Settings observer fail to unregister." am: b92cb6678c
am: 6873e19485
am: cc162a2cfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba4d0ae86737b85b4477db972700c6018e75adbb
2020-12-29 06:24:02 +00:00
Treehugger Robot
cc162a2cfa
Merge "Settings observer fail to unregister." am: b92cb6678c
am: 6873e19485
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia3d1bb6248061f8e566d6db457ee1ad81e4be116
2020-12-29 06:08:37 +00:00
Treehugger Robot
6873e19485
Merge "Settings observer fail to unregister." am: b92cb6678c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f67c00a5fbb23594a527d0a8d77b9617b635a18
2020-12-29 05:38:14 +00:00
Treehugger Robot
b92cb6678c
Merge "Settings observer fail to unregister."
2020-12-29 05:26:12 +00:00
TreeHugger Robot
b0fe302a6d
Merge "Sync the screen timeout preference to display_settings_v2.xml"
2020-12-29 04:20:53 +00:00
Chiachang Wang
283136fb24
Merge "Update getMobileProvisioningUrl to telephony surface" am: 6aef579198
am: 85b853725d
am: e3b7c01f9a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2430c5b1fb40bdf89461c535a0fef85eb911b7ea
2020-12-29 01:23:41 +00:00
Amber Ogata
9d5de29fcc
Add intent filter to open premium sms setting.
...
Test: adb shell am start -a android.settings.PREMIUM_SMS_SETTINGS -d package: com.android.settings
Bug: b/175911991
Change-Id: I1b48494d8d388ad52c5966dbd1e89b1a6f9c6785
2020-12-29 01:19:58 +00:00