PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,019 Commits 1 Branch 0 Tags
7d90692f14a2590a13d0824c55a6f284f0cee61a
Commit Graph

102019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Bill Yi
abb0f07146 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I568e9468bcef9fb4bfe8a6e5c5d2573fa3c018b3
 2022-03-23 18:13:16 +00:00
Bill Yi
5a15b32995 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac 
Blank merge reason: commit message contains skip directive

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

Change-Id: I3a298ec797195f9f7240b4c51c26657d91f4e764
 2022-03-23 18:09:34 +00:00
Bill Yi
a2aacc0aac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifea2ae405190a88de4e795fd91ec426f7cea3be5
 2022-03-23 18:09:25 +00:00
Bill Yi
4f7405f4d8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I33b6f6118cbf42a488e1369b41c7a87ab8e888cf
 2022-03-23 18:07:37 +00:00
Bill Yi
a624ee3140 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifbd5a108750f88997c469b01bbddd357e74070c5
 2022-03-23 18:05:54 +00:00
Bill Yi
ab0bfefb6c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I58009fae8d10e23e7ebaec62817ebb90475c6d28
 2022-03-23 18:01:17 +00:00
Bill Yi
c2e03b0a34 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I04fa07dc7042775ce964d9d1e6a2af4d8b7cd12b
 2022-03-23 17:57:21 +00:00
Bill Yi
71c4f28a23 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2aec804097 
Blank merge reason: commit message contains skip directive

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

Change-Id: If7606162a56f2d6b003424c71b7341516bfea187
 2022-03-23 17:53:49 +00:00
Bill Yi
2aec804097 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I878477ca669ea08c234a859312994165fe6d6b4c
 2022-03-23 17:53:40 +00:00
Bill Yi
32c162a22c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d8a0564189 2p: bb28476c84 
Blank merge reason: parent was merged -s ours

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

Change-Id: I86de65c79377009451276ef399dc8c45ccaf296e
 2022-03-23 17:52:25 +00:00
Bill Yi
bb28476c84 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 2p: d8a0564189 
Blank merge reason: parent was merged -s ours

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

Change-Id: I1474c1522055ed7c65cfdbaa8fabedb46776f044
 2022-03-23 17:52:19 +00:00
Bill Yi
d8a0564189 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ff73238f91 
Blank merge reason: commit message contains skip directive

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

Change-Id: I81351f8d440bef564488a48ff79712079ff9146e
 2022-03-23 17:52:07 +00:00