PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,187 Commits 1 Branch 0 Tags
21c5e714c209bf40a1838a395a5be96ef16a7d4c
Commit Graph

102187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinyi Zhou
22229e5b9c Merge "Update API according to API council feedback" into tm-dev am: 9badccfc9d am: ecada6d32d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: If425f6ac05667e1dc255e65cc1f08733f8899c64
 2022-03-24 05:22:19 +00:00
Xinyi Zhou
ecada6d32d Merge "Update API according to API council feedback" into tm-dev am: 9badccfc9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I6ecf3590d89223f062163a51a0f94f55902aaafd
 2022-03-24 04:59:43 +00:00
Xinyi Zhou
79e82f244a Merge "Update API according to API council feedback" into tm-dev am: 9badccfc9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I5af96de8ad3a930d8243f423bbb7e7564786d063
 2022-03-24 04:59:08 +00:00
Xinyi Zhou
fa5926b065 Merge changes from topic "nearby_api_5" into tm-mainline-prod am: e44aae5b29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I9ca3a6d0dc1a0d576206d7a9c5144994686e10a1
 2022-03-24 04:44:00 +00:00
TreeHugger Robot
e10272b35b Merge "Update multiple users strings" into tm-dev am: e741185e17 am: a6430837e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: I2b87902e936ec5b0b3f10a83af6b0f09bf0881dc
 2022-03-24 04:43:26 +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
TreeHugger Robot
1ce836c599 Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: d6ca2dadf4 am: 1b07340b6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: I177f5872ff74fb4e7fd1d088ba00e18b52e8e71a
 2022-03-24 04:38:48 +00: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
e44aae5b29 Merge changes from topic "nearby_api_5" into tm-mainline-prod 
* changes:
  [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
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
a6430837e8 Merge "Update multiple users strings" into tm-dev am: e741185e17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: Id7b8980f463d9e59eaaa09da41a4c223ef8ebbc6
 2022-03-24 04:23:00 +00:00
TreeHugger Robot
1b07340b6c Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: d6ca2dadf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Ia965d488a7663b586cbf8368e9d45c7f5995d2ca
 2022-03-24 04:13:02 +00:00
TreeHugger Robot
cd07cc8dd6 Merge "Update multiple users strings" into tm-dev am: e741185e17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: Iee9d083d7e6d449692f4537e3cbd74db2e7ee8b6
 2022-03-24 04:12:32 +00:00
TreeHugger Robot
09770eb915 Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" into tm-mainline-prod am: f4f09c446e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: I27478be8b332678c8e5fddde80338f39110beffe
 2022-03-24 04:08:29 +00:00
TreeHugger Robot
bdc72eb689 Merge changes from topic "presubmit-am-a4b5fed487654d059d858e79df0cd2fb" into tm-mainline-prod am: f6fb17fcb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Iea4285a0353c4f8cc4361d0bd3e75cfd66810bf9
 2022-03-24 04:07:54 +00:00
TreeHugger Robot
2417ba1d6c Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: d6ca2dadf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Ia1377e866b9c3d9a1ad6108715f5b08010155a8d
 2022-03-24 04:05:47 +00:00
TreeHugger Robot
e741185e17 Merge "Update multiple users strings" into tm-dev 2022-03-24 04:05:07 +00:00
TreeHugger Robot
f4f09c446e Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" into tm-mainline-prod 
* changes:
  [automerge] Update multiple users strings 2p: 296b904bf1
  Update multiple users strings
 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
Joe Bolinger
8d5082848d Set exported flag to false. 
It was set to true when the attribute became required in I878adb9108c95f06ddd059b23a542b61210edfa4

Bug: 222684510
Test: manual (see bug)
Change-Id: I8f67a5c3ac92f4813dc503cada8888833d7dbfbf
 2022-03-24 00:39:20 +00:00
TreeHugger Robot
d6ca2dadf4 Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev 2022-03-23 23:33:50 +00:00
TreeHugger Robot
f6fb17fcb2 Merge changes from topic "presubmit-am-a4b5fed487654d059d858e79df0cd2fb" into tm-mainline-prod 
* changes:
  [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624
  Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings
 2022-03-23 23:33:50 +00:00
TreeHugger Robot
c0f98c7049 Merge changes from topic "presubmit-am-a4b5fed487654d059d858e79df0cd2fb" 
* changes:
  [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624 2p: 5178f33861
  [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624
  Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings
 2022-03-23 23:33:50 +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
Lucas Silva
15b70d558c Merge "Update screen saver overlay toggle description" into tm-dev am: 7b9593761a am: 202f5716ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I0639f9514527a21b00882bddc817b4416f5e0ff7
 2022-03-23 22:49:30 +00:00
Lucas Silva
9545187c72 Merge changes from topic "presubmit-am-03ffa3d76b0646d890555c8d427704b5" into tm-mainline-prod am: 4cc583982b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I43626de21434a031de429fea6021e28420b6eaeb
 2022-03-23 22:49:05 +00:00
Lucas Silva
ee3cf38f88 Merge "Update screen saver overlay toggle description" into tm-dev am: 7b9593761a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I3c5ebb9243dc9f4f6cf23277b4b7fdbaf37fa925
 2022-03-23 22:48:34 +00:00
Lucas Silva
202f5716ca Merge "Update screen saver overlay toggle description" into tm-dev am: 7b9593761a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I6d4df023486a340b79527071523a0af82961d0cf
 2022-03-23 22:48:23 +00:00
Yi Jiang
2260f2e9cc Merge "Moves battery saver warning message below Screen Attention setting." 2022-03-23 22:41:44 +00:00
Lucas Silva
7b9593761a Merge "Update screen saver overlay toggle description" into tm-dev 2022-03-23 21:56:59 +00:00
Lucas Silva
4cc583982b Merge changes from topic "presubmit-am-03ffa3d76b0646d890555c8d427704b5" into tm-mainline-prod 
* changes:
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d
  Update screen saver overlay toggle description
 2022-03-23 21:56:59 +00:00
Lucas Silva
e5fa785dfa Merge changes from topic "presubmit-am-03ffa3d76b0646d890555c8d427704b5" 
* changes:
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 2p: 072d2beb83
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d
  Update screen saver overlay toggle description
 2022-03-23 21:56:59 +00:00
TreeHugger Robot
3c431c8c7f Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c am: e9fae331a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: I9b6812d0e449b43fdab07a2b877279eef7c0c37a
 2022-03-23 20:31:49 +00:00
TreeHugger Robot
e9fae331a5 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: Ic3909624df98329c215eb400aeee0d9d4838a0fe
 2022-03-23 20:14:25 +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
Presubmit Automerger Backend
39ef1579ef [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Bug: 191386817
Change-Id: Iff78a0cf3e065fc8261b67e94603084e863e206e
 2022-03-23 19:21:46 +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
Bill Yi
e2bd7d9886 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie196fdd648f8d7e1df21cd7323aa851d164db6c2
 2022-03-23 18:22:15 +00:00
Bill Yi
2e2d48ed50 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974 2p: 03a0e1f76e 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ib86e1ebf1939a428ca5c68b63c31c963f2ef1fd7
 2022-03-23 18:19:07 +00:00
Bill Yi
03a0e1f76e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974 
Blank merge reason: commit message contains skip directive

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

Change-Id: I6a955910c7423fd7969b75e6aba20c9f04628313
 2022-03-23 18:18:39 +00:00
Bill Yi
70d210b974 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1925648483a881594f948162c6167facdcc3b268
 2022-03-23 18:17:31 +00:00