Commit Graph

82268 Commits

Author SHA1 Message Date
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
45aeddbe7e 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: Ied722649f6f4886c39d49c4026fde2fd2c156f98
2021-04-22 19:38:59 +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
Julia Reynolds
e6fbc5877e Add enterprise popup to notif lockscreen settings
Test: Robotests, manual with TestDPC
Fixes: 137638270
Change-Id: I22c492d1455cd0a3b6036333cd51a13d87d8a475
2021-04-22 14:55:26 -04: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
77d4991716 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: I518be9807c174b7e01bc25fc3239f17faa1788f1
2021-04-22 16:43:25 +00:00
Evan Severson
cbc3bc5acd Merge "Update mic/camera toggles api" into sc-dev 2021-04-22 16:38:35 +00:00
Daniel Hunt
8d50393223 Add personal dictionary summary text
The resource id 'user_dict_settings_summary' was used to display
summary text of personal dictionary in Froyo. But from GingerBread it
is not used and an empty string is set.
Display above resource as summary text of personal dictionary entry.

Bug: 152970252
Test: Manual
Change-Id: Ib2d6abe1c128d2c7519be2017880cd2d53c026f3
2021-04-22 18:26:31 +02:00
Yomna Nasser
0dda0931e2 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: Ie012eb9fefebd1c5c5b584c1f7145f1ea57de300
2021-04-22 16:25:43 +00:00
Yomna Nasser
7299387774 Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev 2021-04-22 16:00:02 +00:00
tom hsu
f482c28423 [Provider model] Show no connection during out of service.
- When device out of service, show "No connection" on preference summary.
 - Modify the logic of icon and summary.

Bug: 183944316
Test: atest SubscriptionsPreferenceControllerTest passed
Change-Id: I179632918a9145f27cec7d9c08e1c0b675fd1ef6
2021-04-22 21:56:42 +08:00
Yanting Yang
4c36506dd4 Add a new summary for homepage preference of security
Bug: 183586663
Test: rebuilt
Change-Id: Ia494ca0283afa9dbb4610422f3c7b8504a1f67e8
2021-04-22 12:14:42 +00:00
Menghan Li
0a768105b2 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: I83583ff6462f11009f67aeea29b9143d05ba3a68
2021-04-22 11:36:46 +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
48f6cdad57 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: Ibfff6750188ff6b7b050bd6603baa95b51e41ff8
2021-04-22 10:59:42 +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
e72ac29cde 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: Ibf9616b42812495a371aee299e435875c44649ce
2021-04-22 09:12:52 +00:00
YUKAI HUNG
f93d059ec7 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: Ic5e22934ba7db6150b05ecfce0fc229dfec2a8f1
2021-04-22 09:12:47 +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
bc92aa5fb1 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: I5e735a07c27060927342e123e5b6df36c4d6445b
2021-04-22 07:56:36 +00:00
Jeremy Goldman
ba2ac59d50 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: I8810188d7670e61633be0cada0f55e7c98ed0af1
2021-04-22 07:56:17 +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
be4d09f4fe 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: Id807ab2c348cdde21aaf11ccd8074cd33a39b590
2021-04-22 06:46:20 +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
9387dcc992 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: I6e16c1cf9e1c6462844b28903fe3724b0bf68888
2021-04-22 00:51:28 +00:00
Chloris Kuo
6cf4234515 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: If9dfc47c2013a9c40bc83f62b0c88f3ccd048835
2021-04-22 00:42:03 +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
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
0df91fb86c 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: I1078fe8732411656a2b7191e9b5e68a37861aab1
2021-04-21 21:56:01 +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
1ce7157d63 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: I89c59f36081d244a722f726e950e23a327afe0b1
2021-04-21 20:00:47 +00:00
Neil Fuller
33aa65b3cc Merge "Remove restriction for "Use location..."" into sc-dev 2021-04-21 19:54:41 +00:00
Chloris Kuo
61bb91658f NAS setting onboarding string change
Bug: 185112379
Bug: 185535840
Test: manual test on device
Change-Id: Ieb7ea74398ac333b4adc722ea54b30b9f89d02a1
2021-04-21 12:15:52 -07:00
lucaslin
188d66a709 Use [set|get]PrivateDnsMode directly
The value of PRIVATE_DNS_MODE_* has changed from String to int and
ConnectivityManager provides 2 new APIs to set and get private
DNS mode, the caller can use them directly and doesn't need to update
Settings by itself.

Bug: 185311744
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
      2. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: I47706efe9c53a00438fdec97fda244638cecb3dc
2021-04-22 01:46:05 +08:00
TreeHugger Robot
4976265375 Merge "Notif history styling updates" into sc-dev am: b768489fa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14266709

Change-Id: Id48c975be077f7689dd48b61d388844be58842be
2021-04-21 17:18:03 +00:00
TreeHugger Robot
b768489fa0 Merge "Notif history styling updates" into sc-dev 2021-04-21 16:46:31 +00:00
Sally Yuen
fb29b725c0 Merge "Add extra dim keywords to aosp settings" into sc-dev am: 790d69d465
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252125

Change-Id: Ic710c818cab2f65be5db8e8f986c2480093e205d
2021-04-21 16:23:44 +00:00