PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,274 Commits 1 Branch 0 Tags
d91297b13a2f1184201fd84889178e87fad6fbcd
Commit Graph

101274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d91297b13a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:26:09 +00:00
Bill Yi
f2b3e82be3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-24 15:25:55 +00:00
Bill Yi
de5db762b9 Merge changes from topic "presubmit-am-13220b28dc894f18bfa659ed22407a5c" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 2p: d8a0564189
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-24 15:23:51 +00:00
Bill Yi
79cc005ee3 Merge changes from topic "presubmit-am-506ed0de8ea142bfad638ac768dad4cd" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-24 15:23:29 +00:00
PETER LIANG
796ecbc7bb Merge "Fix that strings have the similar color as the background in preview section." into tm-dev am: 03ecb4f4a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341687

Change-Id: Ife1aaa337d4c9ac47a424256c32eb7548d6f6d3d
 2022-03-24 13:44:29 +00:00
PETER LIANG
03ecb4f4a6 Merge "Fix that strings have the similar color as the background in preview section." into tm-dev 2022-03-24 13:41:05 +00:00
TreeHugger Robot
4e5dd0de9e Merge "Update enable toggle processing." into tm-dev am: e6b4297cc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17262737

Change-Id: Ie38f09b199b8a833432cf02a386139c2c6cc7cdd
 2022-03-24 13:38:00 +00:00
TreeHugger Robot
e6b4297cc3 Merge "Update enable toggle processing." into tm-dev 2022-03-24 13:20:57 +00:00
TreeHugger Robot
2e2b5e1e1e Merge changes from topic "presubmit-am-fcba31f692964114b53e9fb9168a57af" into tm-mainline-prod 
* changes:
  [automerge] Update enable toggle processing. 2p: 058796b7eb
  Update enable toggle processing.
 2022-03-24 13:20:57 +00:00
Yasin Kilicdere
49003ed77f Merge "Singularization of duplicated multi user strings." into tm-dev am: b724929454 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Change-Id: I0c19242b2fbf1d3c7a3d0efacca95f90149e9b90
 2022-03-24 12:22:52 +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
e6ae1dbe4d Merge changes from topic "[settings] duplicated-multiuser-strings" into tm-mainline-prod 
* changes:
  [automerge] Singularization of duplicated multi user strings. 2p: 4564bce03c
  Singularization of duplicated multi user strings.
 2022-03-24 12:03:29 +00:00
TreeHugger Robot
17e6118c96 Merge "Update data_usage_bytes_editor spinner background" into tm-dev am: d1c349c572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312731

Change-Id: I24e99cd17f2427f1ea29c74b8d5fd60305080e00
 2022-03-24 10:37:40 +00:00
TreeHugger Robot
6f5e9072ae 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: I2d60265473c2a785850d77cc38bd3603e60a5986
 2022-03-24 10:36:40 +00:00
TreeHugger Robot
d1c349c572 Merge "Update data_usage_bytes_editor spinner background" into tm-dev 2022-03-24 10:28:17 +00:00
TreeHugger Robot
73d2d07d1e Merge "Enhance Settings deep link transition" into tm-dev 2022-03-24 10:16:46 +00:00
Philip Junker
ff5f6bb47f 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: I7ef3eda5c9cc14fe03eb025750982d9696f5bec0
 2022-03-24 10:07:20 +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
687a9405e9 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: I0a4bdff9583b7a265e1a595947ad4fb2615b31c8
 2022-03-24 08:48:37 +00:00
Yuri Ufimtsev
e770b6a717 Merge "Postpone getting Metrics Category until it is needed" into tm-dev am: bdf31dd9dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Change-Id: I1977142ab8d580b75f70b980c96d1d86fd77b258
 2022-03-24 08:48:09 +00:00
TreeHugger Robot
309fc1b00c Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17359096

Change-Id: I6dedc6788f514ff518bff8b666ef9b6742dc04b8
 2022-03-24 08:47:54 +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
bdf31dd9dd Merge "Postpone getting Metrics Category until it is needed" into tm-dev 2022-03-24 07:56:27 +00:00
Yuri Ufimtsev
08e26559c4 Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc" into tm-mainline-prod 
* changes:
  [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
TreeHugger Robot
5b9c125bb7 Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev 2022-03-24 07:40:32 +00:00
Jason Chang
abb753d299 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: If5ab31f60c663fe8373d4d434b7ce24c4e94b3f3
 2022-03-24 06:36:07 +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
6bfb9f50de 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: I1f926c8375f1da0366ce26ae8fbe45061a54ec0c
 2022-03-24 06:08:37 +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
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
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
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
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
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
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
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
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
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
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
e7f902f21c Merge "Add summary to "Vibration & haptics" settings" into tm-dev 2022-03-23 19:58:55 +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
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
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