Bill Yi
c5c844ce7f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 432eae5d7b
-s ours am: 842217b7a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513508
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f84ec81a9bacae27986fb9348afed7c4129dee1
2021-02-08 17:10:51 +00:00
Bill Yi
842217b7a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 432eae5d7b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513508
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c06ab7defb5ec545ec206204d578460c0f207ba
2021-02-08 16:33:19 +00:00
Bill Yi
6a7fe19588
Merge changes from topic "presubmit-am-c9a406587c154801a55df788e0aa3a13"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 797e1e30e7
Import translations. DO NOT MERGE ANYWHERE
2021-02-08 15:44:47 +00:00
Bill Yi
1f9bb31660
Merge changes from topic "presubmit-am-5bc9e6a5da284a399ba4d1d58bd3d258"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 432eae5d7b
Import translations. DO NOT MERGE ANYWHERE
2021-02-08 15:44:39 +00:00
Yanting Yang
d93170a400
Merge "Apply FooterPreference to the sub-pages of Special app access" into sc-dev am: d9d9d70184
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13495591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I899ae7a8178ef984839b4bcf22f9f0d7d494bc63
2021-02-08 13:56:52 +00:00
Yanting Yang
d9d9d70184
Merge "Apply FooterPreference to the sub-pages of Special app access" into sc-dev
2021-02-08 13:25:57 +00:00
Chiachang Wang
a7404aacdc
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38
am: 5c5b36f19d
am: dbd031a46f
am: 36999b5d78
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1475bee722aae6b835c16d7c874f165a6f586554
2021-02-08 12:59:04 +00:00
Chiachang Wang
36999b5d78
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38
am: 5c5b36f19d
am: dbd031a46f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60eb5717af5855b80290af92bed14f2fc702e7a9
2021-02-08 12:12:48 +00:00
Chiachang Wang
dbd031a46f
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38
am: 5c5b36f19d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f3a634620e6467da136e0454ab98c994d7a23a6
2021-02-08 11:31:48 +00:00
Chiachang Wang
5c5b36f19d
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba522bcd7591747f012918dc87f05f7aab1c2a1b
2021-02-08 11:00:55 +00:00
Chiachang Wang
e3be1ecb38
Merge "Replace Proxy hidden constants and methods usages"
2021-02-08 10:27:05 +00:00
TreeHugger Robot
288a3db069
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95
-s ours am: 5130730d9b
-s ours am: 74eb482fba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic8d333454770fddd761decab46a18fc9d6f9e8c7
2021-02-08 06:31:24 +00:00
TreeHugger Robot
7253f1d0ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d
-s ours am: 32a131a0f5
-s ours am: 6289bab031
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff3784fca3ad2e846a71d74ea8eeb059e854a81e
2021-02-08 06:31:09 +00:00
TreeHugger Robot
74eb482fba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95
-s ours am: 5130730d9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2fd7ef384bd5e8c27018204dc00be4ff7d69f796
2021-02-08 05:58:56 +00:00
TreeHugger Robot
6289bab031
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d
-s ours am: 32a131a0f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie56272d926303029464a457794e3883d4d64639b
2021-02-08 05:58:09 +00:00
TreeHugger Robot
5130730d9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic015a19cf6a67a19a6100ff3e787fc62d2031f0a
2021-02-08 05:03:09 +00:00
TreeHugger Robot
32a131a0f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5178301f18df626ea068796c638a59a436029e11
2021-02-08 05:02:34 +00:00
TreeHugger Robot
b182eb84ca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bde6108814
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501304
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f6b05d2ef32669121d377216c4908c8dcb5e2fd
2021-02-08 04:39:38 +00:00
TreeHugger Robot
443e8dfd7b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fea8247b7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13514026
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iafc3b467799aaa6ddaf2e30a556248bc067aad71
2021-02-08 04:39:10 +00:00
TreeHugger Robot
42f0c09a95
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-02-08 04:28:36 +00:00
TreeHugger Robot
ad376e668d
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-02-08 04:24:35 +00:00
TreeHugger Robot
bde6108814
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-08 04:19:37 +00:00
TreeHugger Robot
fea8247b7a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-08 04:12:36 +00:00
Bill Yi
18945ab756
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0eb5f168e5f8e801757b632b339669d3de4121d9
2021-02-07 22:45:51 +00:00
Bill Yi
2e5dc2e9ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5a07b4df06928e6f1913157bfcbefcd6cb37cc6d
2021-02-07 21:17:55 +00:00
Bill Yi
94fc64396b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I68d5c5e5ec56489504224bdd9e431bb96555d6de
2021-02-07 19:27:59 +00:00
Bill Yi
857a2e0052
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieee517e48487579ff5ce29f1aaf4ab7cae860688
2021-02-07 18:58:53 +00:00
Bill Yi
014bccf5cb
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 432eae5d7b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513508
Change-Id: I2d3b36e2481786ad3105f756a57200b8eb4d5021
2021-02-07 18:04:15 +00:00
Bill Yi
432eae5d7b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I716aa1af5ba10de0577da8c6cd471f7c1785b3d4
2021-02-07 18:03:58 +00:00
Bill Yi
85423b7e19
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 797e1e30e7
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513506
Change-Id: Id0980d866cb705e15cdc6c3b50e039d35dae1ac0
2021-02-07 17:33:44 +00:00
Bill Yi
797e1e30e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia01c0035522017ff13ded68061fe7890c7a8fa66
2021-02-07 17:33:30 +00:00
Kevin Chyn
e10ea7e653
Update fingerprint enroll together with frameworks/base am: c01232b16b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13498049
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id6ccba33cad85fda903899c0862df4dcb9a0f94f
2021-02-07 08:20:28 +00:00
Kevin Chyn
c01232b16b
Update fingerprint enroll together with frameworks/base
...
Bug: 179447737
Test: Builds
Change-Id: Ifccb96dbf51e610fb9cd1b238a6ef62350fb1169
2021-02-06 16:57:48 -08:00
Kevin Chyn
fbeb0e5443
Remove UDFPS ProgressBar from Settings am: 2eca234af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13487128
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I518ad0cb647725ce6c8fc5f8cd21ddaaf971227b
2021-02-06 05:42:09 +00:00
Kevin Chyn
2eca234af7
Remove UDFPS ProgressBar from Settings
...
Moving it to SystemUI, which handles rotation and position calculation
much easier.
Bug: 177965281
Test: manual
Change-Id: I9b7aadce95aae26330192074295d91283e49a24d
2021-02-05 18:37:35 -08:00
Manish Singh
0a82da1759
Merge "Disable MTP transcoding by default" into sc-dev am: 92c1b3d5d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13476372
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7535d284e8aea0ddca51b289cc6ca5bf2e811e15
2021-02-05 19:26:31 +00:00
Manish Singh
92c1b3d5d3
Merge "Disable MTP transcoding by default" into sc-dev
2021-02-05 18:57:49 +00:00
Jiashen Wang
0e018cafa4
Merge "Post SUW Slot Change Receiver Migration" into sc-dev am: ce08013af6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13411158
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d1d26401f4e39709a8fc2061c8105628d8615c8
2021-02-05 18:51:14 +00:00
Jiashen Wang
ce08013af6
Merge "Post SUW Slot Change Receiver Migration" into sc-dev
2021-02-05 18:13:58 +00:00
Yanting Yang
3e9e90aa92
Apply FooterPreference to the sub-pages of Special app access
...
Affected pages:
- Display over other apps
- Modify system settings
- Picture-in-picture
- Install unknown apps
- Usage access
- Wi-Fi control
Bug: 179234542
Test: robotests & visual
Change-Id: Icac09d0cf2b92cb5b74a8c5629e211108a78cdb0
2021-02-06 00:06:53 +08:00
TreeHugger Robot
0eca3879a5
Merge "[Provider Model] Airplane mode slice design change" into sc-dev am: c30cd79f35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13480086
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If56fd2bb1e1bf6921a58d4bc0d151bff4f559f0c
2021-02-05 10:18:02 +00:00
Ben Chung
bbb0911165
Add accessibility shortcuts fragment in a11y settings am: e66e641980
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448952
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71bd4a290afc7b07b55b6956bd8d59291ff6ce42
2021-02-05 10:16:25 +00:00
TreeHugger Robot
c30cd79f35
Merge "[Provider Model] Airplane mode slice design change" into sc-dev
2021-02-05 09:56:46 +00:00
Chiachang Wang
9aaad19a82
Replace Proxy hidden constants and methods usages
...
Proxy is a part of incoming connectivity mainline module. The
hidden APIs are no longer available outside the module. These
shared constants and methods are moving to ProxyUtils insdide
net shared lib. Update the corresponding usage in the caller
side.
Bug: 172183305
Test: atest SettingsRoboTests
Change-Id: I2d51442e65dbcdf1a36940d8a25c7571363d56e6
2021-02-05 17:37:14 +08:00
Weng Su
6a5c02a5bb
[Provider Model] Airplane mode slice design change
...
- Change title text:
WiFi enabled: Turn off networks
WiFi disabled: Turn on networks
- Add end icon with colorAccent
- The title text color changed is not included this CL.
- Screenshot
https://screenshot.googleplex.com/44yYKphdem87UnU
Bug: 178719303
Test: manual test
atest -c AirplaneSafeNetworksSliceTest
Change-Id: I27ec111c3c9d4e228010b1495a9d0c7956ba5d74
2021-02-05 16:45:30 +08:00
TreeHugger Robot
c59798354d
Merge "Remove battery usage column icon (1/2)" into sc-dev am: f969007c44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13480088
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I655d0326c8e8a7faff6e2254562aa1808344e4e4
2021-02-05 07:40:53 +00:00
Ben Chung
e66e641980
Add accessibility shortcuts fragment in a11y settings
...
Accessibility settings category restructure, add accessibility shortcuts
fragment for related accessibility services.
Bug: 174829936
Test: atest AccessibilityShortcutsFragmentTest, atest AccessibilitySettingsTest
Change-Id: I9706906863872bc60d31eae54bbf3a35d70e812e
2021-02-05 07:30:49 +00:00
Sarah Chin
4295ca35f8
[automerger skipped] Merge "Update onSubscriptonOverride listener" am: bff5a89842
am: d25b9c12b6
-s ours am: ad0fcc19c0
-s ours am: 2184c4eecc
-s ours
...
am skip reason: Change-Id I9436b414608d7c964185d3d5c3f1f554c65b2c12 with SHA-1 57fbecc6c1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iecc9749dbfb3d3b1595cd075f66d8da8ef0f2fa5
2021-02-05 07:30:12 +00:00
TreeHugger Robot
f969007c44
Merge "Remove battery usage column icon (1/2)" into sc-dev
2021-02-05 07:21:21 +00:00
Sarah Chin
2184c4eecc
[automerger skipped] Merge "Update onSubscriptonOverride listener" am: bff5a89842
am: d25b9c12b6
-s ours am: ad0fcc19c0
-s ours
...
am skip reason: Change-Id I9436b414608d7c964185d3d5c3f1f554c65b2c12 with SHA-1 57fbecc6c1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0e97f49cbbbbdd1427e67275995369da84b6bc7
2021-02-05 07:03:56 +00:00