PETER LIANG
810ab566e7
Merge "Correct the position of the marker for audio adjustment." into sc-v2-dev
2021-08-30 09:55:35 +00:00
ykhung
ea57d6863e
[B&R] restore the backup data for app optimization mode back am: adec23a106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15681503
Change-Id: I4977c0f78803d943426a7b2d64b0304bbc2c0b8a
2021-08-30 09:50:51 +00:00
ykhung
9ac072dafe
[Performance] avoid setting the same optimization mode again
...
Add a checking condition to avoid setting the same optimization mode again to improve the performance, since setting the optimization mode is a heavy operation when binding with system service.
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I4065e3c56201c1c9285d9cebedf670bc0c42c614
2021-08-30 09:25:51 +00:00
Peter_Liang
ba297dc396
Correct the position of the marker for audio adjustment.
...
Root cause: Miss one the layout padding condition for computing the position of the marker.
Solution: add the layout padding condition into.
Bug: 196980036
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBarTest ROBOTEST_FILTER=BalanceSeekBarPreferenceTest
Change-Id: Id0c6ebbc981d9ef41e7956ffff1fc5b9d4c0e787
2021-08-30 07:16:35 +00:00
ykhung
adec23a106
[B&R] restore the backup data for app optimization mode back
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
adb shell bmgr restore 3e9867a7660315b8 com.android.settings
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: Ia35f8caa8fe2408be28c3494785a174a1aeb11da
2021-08-30 06:45:26 +00:00
Bill Yi
ad36be59e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 7514b30f06
-s ours am: 6ee3b9fe8a
-s ours am: b089d5fdb8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: If690ee2fa79cf805ea6e879e319240b830ff0606
2021-08-29 21:21:48 +00:00
Bill Yi
72eecdb52c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 3fb65a4774
-s ours am: 05320e232c
-s ours am: b4971c8081
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I2ed214e5ef8da26dd6eddf0a3ccafa80e96cf615
2021-08-29 21:21:20 +00:00
Automerger Merge Worker
4f09e08067
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 4a7694c598
-s ours" into sc-qpr1-dev-plus-aosp am: f0125f178a
-s ours am: 3076270ac6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ic20c297003a7c1e40ece6c060c065c5753a1c4b5
2021-08-29 21:20:23 +00:00
Bill Yi
9d32cd7427
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 7514b30f06
-s ours am: 92c5bac1ee
-s ours am: 40920a9988
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I11487c53cebad7740090e0bd7ba0651784be7587
2021-08-29 21:19:58 +00:00
Bill Yi
810ad3ec97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 3fb65a4774
-s ours am: 3f5f5f723d
-s ours am: 0f298f914e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I96a4ef81dd67a04858d0b8434fae99b078c48a91
2021-08-29 21:18:26 +00:00
Bill Yi
7ad7aa12c0
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
am: cd985a6cda
am: 5925687faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I3b4fe19dff6f59429c97c72b803ab2b3be955037
2021-08-29 21:17:26 +00:00
Bill Yi
acc80c816f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
am: 1a1eba9262
-s ours am: 04d8c15606
-s ours am: c41d771696
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ic9efe16e770e2390fb4faea3bb5103172ea33b3d
2021-08-29 21:17:24 +00:00
Bill Yi
284f34bd68
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
am: c0170add88
am: 672aef8317
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I20d67af7b2cc098f849d29b689772fdda3ba2de6
2021-08-29 21:09:08 +00:00
Bill Yi
ae851209b3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
am: 30f4367fed
-s ours am: dca06614d7
-s ours am: a6229746ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ic379b8f9d5420a3f00d1ea743c01f581315baf1e
2021-08-29 21:09:07 +00:00
Bill Yi
bbbcbf1127
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
am: 7b3a20b43d
am: d375f28fd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ib7a3ee5a47242015ae5ab2c1ffaa41ff97309df8
2021-08-29 21:06:03 +00:00
Bill Yi
04ab2969f9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
am: 1a1eba9262
-s ours am: 74f497939e
-s ours am: ef9b084efb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: If9dbd12540d446e8cc4ecbd4e7a713735ed45e25
2021-08-29 21:06:02 +00:00
Bill Yi
c24001e149
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 1f17c42c16
-s ours am: 8239b2a6a8
-s ours am: de99d262e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I505415de497543c400736efb019f2f0c5bc12b6c
2021-08-29 21:01:46 +00:00
Bill Yi
a824bbf757
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d
am: 9cc95ebe5b
am: 77bff5ef7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I34507995e155c4791fc71634138343fbc5552461
2021-08-29 21:00:17 +00:00
Bill Yi
ab839b8f71
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
am: df34345697
-s ours am: da1bc4bff5
-s ours am: 64e5c9de09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I09f05d42abafdef8f65e5e9cc779d8fbba7e18ae
2021-08-29 21:00:15 +00:00
Bill Yi
04db613462
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
am: 91021b56dc
am: bcbe3382ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ibc9636e4734614f6fbbcef351e517b595d3e4be0
2021-08-29 20:58:22 +00:00
Bill Yi
18adf89ef3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
am: 30f4367fed
-s ours am: d026c13fc6
-s ours am: c379e0ec81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ia7e3378820404b5efef34ee080edb60e22c23d7f
2021-08-29 20:58:21 +00:00
Bill Yi
8a064629f9
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70
am: edc641b1bf
am: 92c1605bf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I1094cb930e4eff3640ba7ea2a0169624324c5773
2021-08-29 20:56:32 +00:00
Bill Yi
f751633dac
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
am: a60710d90a
-s ours am: 9a2e9009d3
-s ours am: 3301afbdf1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I40a80bd4b535cb6faf0dbd7f32eeafee1a410082
2021-08-29 20:56:22 +00:00
Bill Yi
b089d5fdb8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 7514b30f06
-s ours am: 6ee3b9fe8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ied0547f45bb052ec2950e48e73cf08b3721a16c7
2021-08-29 20:53:56 +00:00
Bill Yi
b4971c8081
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 3fb65a4774
-s ours am: 05320e232c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Iaeae63a70ee7d69fde348692975df5dfbe2062a3
2021-08-29 20:52:56 +00:00
Automerger Merge Worker
3076270ac6
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 4a7694c598
-s ours" into sc-qpr1-dev-plus-aosp am: f0125f178a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I7a995a143a62de8c38271a4fb75a3c0ae941cb20
2021-08-29 20:52:07 +00:00
Bill Yi
40920a9988
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 7514b30f06
-s ours am: 92c5bac1ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: If3688649cb0d134641fb4c802a8dee6fcfebf6dd
2021-08-29 20:50:06 +00:00
Bill Yi
0f298f914e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 3fb65a4774
-s ours am: 3f5f5f723d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I47145585902025298923715fdb8034b64a44b868
2021-08-29 20:50:02 +00:00
Bill Yi
5925687faa
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
am: cd985a6cda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I9c24042908cab8d571b1b2504d3ef07057649363
2021-08-29 20:49:56 +00:00
Bill Yi
c41d771696
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
am: 1a1eba9262
-s ours am: 04d8c15606
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Iabb84f9921bbe64eafe23ea6ff2bb2ece3b085b1
2021-08-29 20:49:55 +00:00
Bill Yi
672aef8317
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
am: c0170add88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I7c24660c490a0dadf9c4d82abec0976cfe59e75a
2021-08-29 20:47:53 +00:00
Bill Yi
a6229746ea
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
am: 30f4367fed
-s ours am: dca06614d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ib42badd4b757935d9eb247a4aabe6bd4f0b5f016
2021-08-29 20:47:51 +00:00
Bill Yi
d375f28fd9
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
am: 7b3a20b43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Iaa2181598a2bfcc8a97fe5630f7ae050c13d6f51
2021-08-29 20:46:27 +00:00
Bill Yi
ef9b084efb
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
am: 1a1eba9262
-s ours am: 74f497939e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ib200f404e6694cc471161af167a422e91f11eda1
2021-08-29 20:46:27 +00:00
Bill Yi
de99d262e0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 1f17c42c16
-s ours am: 8239b2a6a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I231341792d38993cd025197ba7fc2f73486d02ae
2021-08-29 20:45:43 +00:00
Bill Yi
77bff5ef7f
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp am: 3c86e4eb2d
am: 9cc95ebe5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: If52ec4968d8841768e0d433b219bc010da9fb286
2021-08-29 20:45:06 +00:00
Bill Yi
64e5c9de09
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
am: df34345697
-s ours am: da1bc4bff5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Idc082ac4539ff2e9598223db17e58793879c1757
2021-08-29 20:45:06 +00:00
Bill Yi
bcbe3382ff
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev am: b7f7a895fd
am: 91021b56dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I54d1f073416ca12441b25504c8917ed560f823f9
2021-08-29 20:43:27 +00:00
Bill Yi
c379e0ec81
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
am: 30f4367fed
-s ours am: d026c13fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I8e99e9781f340aa3c54284de6abe194caf61caa5
2021-08-29 20:43:26 +00:00
Bill Yi
7cce72c05a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: b53d0089cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I06e722c284e793ca7ae1ac519460b2d108d7d8e7
2021-08-29 20:42:26 +00:00
Bill Yi
92c1605bf8
Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp am: 110c972e70
am: edc641b1bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ic44a5c196626f22a982c019e4eae1165e82097b9
2021-08-29 20:42:18 +00:00
Bill Yi
f147f74b0a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: cc19de6420
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ia6939c06c4d901ebb702ddab1bf51ed8b7713632
2021-08-29 20:42:17 +00:00
Bill Yi
3301afbdf1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
am: a60710d90a
-s ours am: 9a2e9009d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I753967f0ac2065569408cc7378982fb6c9337f21
2021-08-29 20:42:16 +00:00
Bill Yi
6ee3b9fe8a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 7514b30f06
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I7654c16cf3d03862a8c14767ba80d0621e5684fe
2021-08-29 20:34:02 +00:00
Bill Yi
05320e232c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 3fb65a4774
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I617e4b8b03b02045bbda51b79e641593eee5f5e1
2021-08-29 20:33:44 +00:00
Bill Yi
92c5bac1ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 7514b30f06
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Idf6d3083a3031388b872cf1270afb4a1afb9992e
2021-08-29 20:33:30 +00:00
Bill Yi
3f5f5f723d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c
-s ours am: 3fb65a4774
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: Ic56dfe50044196e1fc6469e1a6da1424d480bb9e
2021-08-29 20:33:23 +00:00
Automerger Merge Worker
f0125f178a
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 4a7694c598
-s ours" into sc-qpr1-dev-plus-aosp
2021-08-29 20:32:33 +00:00
Bill Yi
c64842a1f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948
-s ours am: 4a7694c598
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: Ic6cc2eff4f54925bcbe4f3e23e981bdc2bf8e8c4
2021-08-29 20:32:31 +00:00
Bill Yi
7b3a20b43d
Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev am: 0d2b7238bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I2587536f2eb8e7050555110ec969d8c9e5324f25
2021-08-29 20:32:28 +00:00