Commit Graph

81058 Commits

Author SHA1 Message Date
Treehugger Robot
e15549a3df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7 -s ours am: 220ba05109 -s ours am: a0a5760ff9 -s ours am: 16f3036c4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42acb88a6fe3ea4c0225f41b425282b3d3f18487
2021-04-22 21:37:08 +00:00
Treehugger Robot
7812b2e833 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours am: dda5464180 -s ours am: c17720247e -s ours am: 929bde97a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f5bddffe57811a64a04e7cc55bdec08209ed041
2021-04-22 21:36:59 +00:00
Treehugger Robot
f84734902b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours am: ab17423f8f -s ours am: 802d9f3c8f -s ours am: 06cedc7e3b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2b9313143c3f64dcd85c2602270899af4f1c92c
2021-04-22 21:35:51 +00:00
Treehugger Robot
16f3036c4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7 -s ours am: 220ba05109 -s ours am: a0a5760ff9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac64b675b986115c3c7330b2c23ab9f480da07d6
2021-04-22 21:34:14 +00:00
Treehugger Robot
929bde97a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours am: dda5464180 -s ours am: c17720247e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8c36bb7fa55f3f114e08d60c7fb20ae9e0cb696
2021-04-22 21:33:55 +00:00
Treehugger Robot
a0a5760ff9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7 -s ours am: 220ba05109 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7a95d05a05529fba88972f0714683b2da4c5fc7
2021-04-22 21:12:58 +00:00
Treehugger Robot
c17720247e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours am: dda5464180 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a1156f535c7cfd8d529ea4071c585db403ac314
2021-04-22 21:12:55 +00:00
Treehugger Robot
06cedc7e3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours am: ab17423f8f -s ours am: 802d9f3c8f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcdaf021486a57421af5028cf3f42aa88889e8c4
2021-04-22 21:04:36 +00:00
Treehugger Robot
220ba05109 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieec4e25b4a582e782b410df438d401d1a328aac7
2021-04-22 20:55:37 +00:00
Treehugger Robot
dda5464180 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74ccbff817c7d8e695e38a56e6a48c00df1a7d9b
2021-04-22 20:50:28 +00:00
Treehugger Robot
802d9f3c8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours am: ab17423f8f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86c667f5d23e47d29443a055443f786b78922ada
2021-04-22 20:43:29 +00:00
Treehugger Robot
ab17423f8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a0298e75ff4adce5487c6e86153d5364e95f7c0
2021-04-22 20:26:17 +00:00
Treehugger Robot
acc37353d7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 20:01:33 +00:00
TreeHugger Robot
884490487e Merge "Change "Manage location services" to "Location services"" into sc-dev am: 9064ecd051
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271284

Change-Id: Ia94df098b5262c4c67367fc6fbbb130085957b52
2021-04-22 19:39:56 +00:00
Treehugger Robot
5d68dc45b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:24:09 +00:00
Treehugger Robot
631013489d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:20:30 +00:00
TreeHugger Robot
9064ecd051 Merge "Change "Manage location services" to "Location services"" into sc-dev 2021-04-22 19:16:34 +00:00
Yu-Han Yang
2e177b234e Change "Manage location services" to "Location services"
Also updates its icon.

Bug: 180533061
Test: on device
Change-Id: I1ceaa82bd30b05435cff65905b01af5a6c41bac6
2021-04-22 10:51:28 -07:00
Bill Yi
86cf8dc82f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I74a0174984401e63ae86978bb3d472cb6422c1ce
2021-04-22 10:33:24 -07:00
Bill Yi
183d5436b6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I670023c95e90df9d083ad0359c70b19195ccfb02
2021-04-22 10:31:33 -07:00
Bill Yi
fbcfe8af01 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I814358b71ad2829789f1d9ac0711e369dddd11e4
2021-04-22 10:28:15 -07:00
Evan Severson
20dd13c1f6 Merge "Update mic/camera toggles api" into sc-dev am: cbc3bc5acd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14193836

Change-Id: I6b856c1899d7853916956e373d6e0c2c4328b66e
2021-04-22 16:42:19 +00:00
Evan Severson
cbc3bc5acd Merge "Update mic/camera toggles api" into sc-dev 2021-04-22 16:38:35 +00:00
Yomna Nasser
90c06c5543 Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev am: 7299387774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14218034

Change-Id: Ieba8286b6321b3cbacb7356e83c9b312afc5226a
2021-04-22 16:27:38 +00:00
Yomna Nasser
7299387774 Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev 2021-04-22 16:00:02 +00:00
Menghan Li
46ec32a684 Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev am: 09f6086bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255419

Change-Id: I39fab7c94bddbace2984ed8c18a2c58e7aea081d
2021-04-22 11:38:19 +00:00
Menghan Li
09f6086bea Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev 2021-04-22 11:18:23 +00:00
TreeHugger Robot
c7dd99af68 Merge "Replace to correct footer preference style" into sc-dev am: 913dd4c8a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14271576

Change-Id: Ia15cf079ad93d022bf2ff183f480c7e82027768c
2021-04-22 11:01:16 +00:00
TreeHugger Robot
913dd4c8a0 Merge "Replace to correct footer preference style" into sc-dev 2021-04-22 10:42:55 +00:00
Tsung-Mao Fang
a58b144822 Replace to correct footer preference style
Test: Rebuilt apk and see the result
Fix: 186078568
Change-Id: I24ee2371dd51b8be4aa69d51d08c534117978ff2
2021-04-22 17:28:26 +08:00
Wesley Wang
c99ce53e7e Merge "Update app usage page active time format" into sc-dev am: 6ffcf8bfa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14264141

Change-Id: Ie864ccf254b877bff4a8ed1e060890133a1e474d
2021-04-22 09:14:19 +00:00
YUKAI HUNG
87714e3201 Merge "Implement expandable item for system component usage data" into sc-dev am: 7144b6fe5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266965

Change-Id: I9cf1d0aaab7d7e560888615536f01b2768840486
2021-04-22 09:13:56 +00:00
Wesley Wang
6ffcf8bfa9 Merge "Update app usage page active time format" into sc-dev 2021-04-22 08:52:39 +00:00
YUKAI HUNG
7144b6fe5d Merge "Implement expandable item for system component usage data" into sc-dev 2021-04-22 08:42:45 +00:00
Joy Babafemi
bdf6d289be Merge "Add UWB Settings" into sc-dev am: a1fe5ec083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14240457

Change-Id: Ic5fa6c615539833b38a6c91b27efe4d2c7fbe0b3
2021-04-22 07:58:10 +00:00
Jeremy Goldman
a822085b71 Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev am: ef7fd39f91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233634

Change-Id: I511456251c08b75dab6c77d5f4004d512280bb37
2021-04-22 07:57:38 +00:00
Joy Babafemi
a1fe5ec083 Merge "Add UWB Settings" into sc-dev 2021-04-22 07:39:12 +00:00
Jeremy Goldman
ef7fd39f91 Merge "Make gear symbol in "Mobile Data Usage" RTL friendly" into sc-dev 2021-04-22 07:26:10 +00:00
ykhung
e1cec0e08d Implement expandable item for system component usage data
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id488ab23039ff12480da5e02b6a96ff70e879007
2021-04-22 06:50:39 +00:00
TreeHugger Robot
5abd10ed60 Merge "Update the style for collapsing toolbar" into sc-dev am: ea2a359561
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199749

Change-Id: I289a734eb4ab88dd017c8d3c169cd0a150dcd69f
2021-04-22 06:47:14 +00:00
TreeHugger Robot
ea2a359561 Merge "Update the style for collapsing toolbar" into sc-dev 2021-04-22 06:40:23 +00:00
Joy Babafemi
a5672945ae Add UWB Settings
Screenshot 1: https://screenshot.googleplex.com/5wjKkioeehZnz74
Screenshot 2: https://screenshot.googleplex.com/AtaufsUgLgVk2Ur

Test: Robotest
Bug: 183254940
Change-Id: Ibd2e3f3ad9596dddbdd23d7f2ad5e03768648faf
2021-04-22 06:16:35 +00:00
PETER LIANG
2919b6785c Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev am: f71aad11e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14265788

Change-Id: Ia6a3091f8986afdf8b46c5facafaa0ff01a9a584
2021-04-22 00:53:28 +00:00
PETER LIANG
f71aad11e3 Merge "Fix the entire text is aligned middle of the Vision setting screen." into sc-dev 2021-04-22 00:41:41 +00:00
Chloris Kuo
f52898401c Merge "NAS setting migration" into sc-dev am: 1a44af9585
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14259014

Change-Id: Ia0043098fa7a67e561ec8b085e4fbfcb3b1ef302
2021-04-22 00:31:25 +00:00
Chloris Kuo
1a44af9585 Merge "NAS setting migration" into sc-dev 2021-04-22 00:23:25 +00:00
Yomna Nasser
e43f26294d Handle invalid subIds in Enable2gPreferenceController.
Implements improved handling of invalid subIds in the
"Allow 2G" controller + unit tests.

Bug: 185264531
Test: m & atest -c Enable2gPreferenceControllerTest
Change-Id: I7587f1a2a8150bbc6cc0864c9a13d0d910a26682
2021-04-22 00:14:29 +00:00
Curtis Belmonte
c17e2e75a5 Merge "Log new auth-related framework atoms for Android 12" into sc-dev am: b662335341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14257139

Change-Id: Ic20841bee00c0a6627d1c772c346409edf894ba1
2021-04-21 21:57:59 +00:00
Curtis Belmonte
b662335341 Merge "Log new auth-related framework atoms for Android 12" into sc-dev 2021-04-21 21:34:22 +00:00
Neil Fuller
297ba96a01 Merge "Remove restriction for "Use location..."" into sc-dev am: 33aa65b3cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251331

Change-Id: Ief6368326813f6e444675ce0ff19ba35b3e0ff93
2021-04-21 20:01:40 +00:00