Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,067 Commits 1 Branch 0 Tags
5bcfb709b84d5afacf1cffbf432d2892b46c2203
Commit Graph

41756 Commits

Author SHA1 Message Date
PETER LIANG
d2fcfa1dee Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev am: d2e82f8e6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252808

Change-Id: Ibd07d6fa1979b1315582a1f8b44d4ab04166956a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 00:54:37 +00:00
PETER LIANG
d2e82f8e6d Merge "Fix that the user has no way of knowing if the reset was successful." into tm-dev 2022-03-25 00:30:55 +00:00
TreeHugger Robot
ce49123205 Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev am: d84516dd28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352024

Change-Id: I569924849f4a3bafc95cce6c1325f9f10bae8a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 00:13:20 +00:00
TreeHugger Robot
d84516dd28 Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev 2022-03-24 23:51:31 +00:00
TreeHugger Robot
4ccde95a1a Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev 2022-03-24 17:55:23 +00:00
TreeHugger Robot
b9bbd922c0 Merge changes from topic "presubmit-am-e8878964df004ef1a08911a61493aad3" 
* changes:
  [automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298 2p: 352f747f82
  [automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298
  Enable Encryption & Creds UI for Secondary users
 2022-03-24 17:55:23 +00:00
Abel Tesfaye
01d030ccc6 Merge "Use setRotationLock in LockScreenRotationPreferenceController" 2022-03-24 17:25:58 +00:00
Kedar Chitnis
993371d476 Merge "Revert "Guest mode UX flow updates to user settings"" 2022-03-24 13:25:21 +00:00
TreeHugger Robot
e6b4297cc3 Merge "Update enable toggle processing." into tm-dev 2022-03-24 13:20:57 +00:00
TreeHugger Robot
815af402fc Merge changes from topic "presubmit-am-fcba31f692964114b53e9fb9168a57af" 
* changes:
  [automerge] Update enable toggle processing. 2p: 058796b7eb 2p: 9b0a2c7612
  [automerge] Update enable toggle processing. 2p: 058796b7eb
  Update enable toggle processing.
 2022-03-24 13:20:57 +00:00
Kedar Chitnis
ed45e8c56a Revert "Guest mode UX flow updates to user settings" 
Revert submission 16545010-kedarc-ephemeral-guest

Reason for revert: A conflicting CL got merged after presubmits were triggerred, will rebase and push again
Reverted Changes:
I86a5a1571:Guest mode updates to resolve privacy concerns in ...
I7cf205883:Guest mode UX flow updates to user settings

Change-Id: Ia09ab082bb7088831d81e10fd555cecfc8b239f3
 2022-03-24 12:45:25 +00:00
Yasin Kilicdere
b724929454 Merge "Singularization of duplicated multi user strings." into tm-dev 2022-03-24 12:03:29 +00:00
Yasin Kilicdere
442f94b1a6 Merge changes from topic "[settings] duplicated-multiuser-strings" 
* changes:
  [conflict] Singularization of duplicated multi user strings. 2p: 4564bce03c 2p: 39ef1579ef
  [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c
  Singularization of duplicated multi user strings.
 2022-03-24 12:03:29 +00:00
Kedar Chitnis
c33384d653 Merge "Guest mode UX flow updates to user settings" 2022-03-24 11:55:17 +00:00
TreeHugger Robot
2ddb627c77 Merge "Enhance Settings deep link transition" into tm-dev am: 73d2d07d1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17290004

Change-Id: Ie78032f2edb7a3e0081b79cb95886f0c375d0a02
 2022-03-24 10:37:14 +00:00
TreeHugger Robot
73d2d07d1e Merge "Enhance Settings deep link transition" into tm-dev 2022-03-24 10:16:46 +00:00
Philip Junker
c4648f276b Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673

Change-Id: Ia91f563137a21fe5628ca98564d2cc8669d52807
 2022-03-24 10:07:12 +00:00
Philip Junker
bf4878c877 Merge "Add special app access for turning on the screen." into tm-dev 2022-03-24 10:02:49 +00:00
Betty Chang
5ff1a5e1d8 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev am: 0ef919db7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348585

Change-Id: I7413e9ecb53dc9326392097593d6363ebe5b16b4
 2022-03-24 08:48:35 +00:00
Betty Chang
0ef919db7e Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev 2022-03-24 08:21:16 +00:00
Yuri Ufimtsev
d80171d2b4 Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc" 
* changes:
  [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089 2p: 8e7599c129
  [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089
  Postpone getting Metrics Category until it is needed
 2022-03-24 07:56:27 +00:00
Yuri Ufimtsev
bdf31dd9dd Merge "Postpone getting Metrics Category until it is needed" into tm-dev 2022-03-24 07:56:27 +00:00
TreeHugger Robot
5b9c125bb7 Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev 2022-03-24 07:40:32 +00:00
Jenhou (Alan) Huang
b5c3a872d1 Merge "Sync clean up for Spatial audio classes from tm-dev to master" 2022-03-24 07:11:14 +00:00
Jason Chang
ee99fc7d52 Merge "Add checking if device should not support One-handed mode shortcut widget" into tm-dev am: ea5b55ca53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238504

Change-Id: I12e65cd735450fb72101fcad4df436089e21e5c9
 2022-03-24 06:36:00 +00:00
Jason Chang
ea5b55ca53 Merge "Add checking if device should not support One-handed mode shortcut widget" into tm-dev 2022-03-24 06:17:31 +00:00
Jason Hsu
8f6c3fa915 Merge changes from topic "triple-tap" into tm-dev am: a46d6dcebc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220624

Change-Id: I2f2c3b949d15cfa6d2fb40dba6243760f0fa2c9f
 2022-03-24 06:08:33 +00:00
Jason Hsu
a46d6dcebc Merge changes from topic "triple-tap" into tm-dev 
* changes:
  Add link functionality in message of magnification triple-tap dialog
  Apply new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode.
 2022-03-24 05:49:16 +00:00
Jason Chiu
177573c892 Enhance Settings deep link transition 
Since the deep link mechanism uses a trampoline activity to redirect the
target activity, and the targeting activity is launched in a separate
task, there will be two transitions played, where one is the splash
screen with the trampoline acitvity and another one is the task
transition. This makes the UX weird.

To avoid this, this CL tries to make the targeting activity launch in
the same task as the trampoline acitivity by removing the taskAffinity,
so there won't be a task transition.

Fix: 215275940
Test: Create a settings shortcut on the home screen and launch it.
Change-Id: I7621ab9f1132acbf619495801a3b985c5c3b1b5d
 2022-03-24 12:42:01 +08:00
Xinyi Zhou
9badccfc9d Merge "Update API according to API council feedback" into tm-dev 2022-03-24 04:36:17 +00:00
Xinyi Zhou
da8184aa12 Merge changes from topic "nearby_api_5" 
* changes:
  [automerge] Update API according to API council feedback 2p: ad5e65a338 2p: d883631dc5
  [automerge] Update API according to API council feedback 2p: ad5e65a338
  Update API according to API council feedback
 2022-03-24 04:36:17 +00:00
TreeHugger Robot
e741185e17 Merge "Update multiple users strings" into tm-dev 2022-03-24 04:05:07 +00:00
TreeHugger Robot
e9cbde201b Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" 
* changes:
  [automerge] Update multiple users strings 2p: 296b904bf1 2p: 6a966b0aff
  [automerge] Update multiple users strings 2p: 296b904bf1
  Update multiple users strings
 2022-03-24 04:05:07 +00:00
Yi Jiang
8edf692915 Moves battery saver warning message below Screen Attention setting. 
Test:  make RunSettingsRoboTests -j40
Bug: 220252566
Change-Id: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
Merged-In: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
(cherry picked from commit 70128d9016)
 2022-03-24 00:41:03 +00:00
Alan Huang
79af6d552b Sync clean up for Spatial audio classes from tm-dev to master 
Change-Id: I868fe4eec1a25e0fc853e16bd2ea814b13181dec

Test: local build
Change-Id: I6ee69d97300549971b372b27cd99d5b2ff28c3c6
 2022-03-23 23:28:17 +00:00
Yi Jiang
2260f2e9cc Merge "Moves battery saver warning message below Screen Attention setting." 2022-03-23 22:41:44 +00:00
TreeHugger Robot
80bb0d7986 Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: Ic42a9fdf552b40d300604ee1a04b4d28f6eac3bc
 2022-03-23 20:14:07 +00:00
TreeHugger Robot
e7f902f21c Merge "Add summary to "Vibration & haptics" settings" into tm-dev 2022-03-23 19:58:55 +00:00
Presubmit Automerger Backend
7a76ba8558 [conflict] Singularization of duplicated multi user strings. 2p: 4564bce03c 2p: 39ef1579ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Bug: 191386817
Change-Id: I0217ef2321f836ddb066ffac7214522483c9687f
 2022-03-23 19:31:07 +00:00
Yasin Kilicdere
4564bce03c Singularization of duplicated multi user strings. 
Many multi-user strings were duplicated between SettingsLib, Settings,
System UI and Car projects. This CL removes those duplicates.

List of singularized strings: "Guest", "Remove guest", "Add user",
"Remove guest?", "Too many incorrect attempts...."

Bug: 191386817
Test: NA
Change-Id: I8d9629a1a9628cab9f049df84f706bd04ee75cc2
 2022-03-23 19:20:34 +00:00
Presubmit Automerger Backend
8c9de62546 [automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298 2p: 352f747f82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348343

Bug: 123211155
Change-Id: I51660795644e0e61e2fc5f0aff0f75890123e45a
 2022-03-23 19:01:38 +00:00
Presubmit Automerger Backend
352f747f82 [automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348343

Bug: 123211155
Change-Id: Ie00fce7c07aec140dcf7598a4e31c46453a6ab3f
 2022-03-23 19:01:32 +00:00
Ayush Sharma
f1255b4298 Enable Encryption & Creds UI for Secondary users 
Bug: 123211155
Test: Manual,m -j RunSettingsRoboTests
Change-Id: Ic669102c72a5270423f000d5326b48c91901a0ed
 2022-03-23 19:00:34 +00:00
Xinyi Zhou
da41600d8c [automerge] Update API according to API council feedback 2p: ad5e65a338 2p: d883631dc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Bug: 225116248
Change-Id: I98784295a0832770b27568af8a7507e0ae39eea3
 2022-03-23 18:54:35 +00:00
Xinyi Zhou
d883631dc5 [automerge] Update API according to API council feedback 2p: ad5e65a338 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Bug: 225116248
Change-Id: I454e3e7139c3151bd2e5f1f1b0185f44c78d3306
 2022-03-23 18:54:23 +00:00
Xinyi Zhou
ad5e65a338 Update API according to API council feedback 
Test: built and verified logs
Bug: 225116248
Change-Id: I9e0f82446ddd80737b3ee5f92a1bbb1838eef30e
 2022-03-23 11:50:37 -07:00
TreeHugger Robot
b81c42d043 Merge "Fix System language option missing and locale region missing issue" 2022-03-23 18:16:07 +00:00
TreeHugger Robot
0cad38f06f Merge "[Panlingual][patch] Handle onLocaleSelected." 2022-03-23 18:16:07 +00:00
Matt Pietal
607f402bff [automerge] Update multiple users strings 2p: 296b904bf1 2p: 6a966b0aff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Bug: 219078700
Change-Id: I06147b00879436ddbc477061c6dfb40c5e8c12d7
 2022-03-23 17:40:52 +00:00
Matt Pietal
296b904bf1 Update multiple users strings 
To match latest guidance

Bug: 219078700
Test: manual
Change-Id: Ieef884e046e1e1798cc98a553bcd902c1374d069
 2022-03-23 13:39:42 -04:00