Commit Graph

94438 Commits

Author SHA1 Message Date
Dmitri Plotnikov
99ec71728f Merge "Remove uses of deprecated class BatterySipper also, remove the obsolete class FakeUid" 2021-08-31 22:36:55 +00:00
Betty Chang
dc45560bd6 Merge "Change the SIM color for passing the GAR" 2021-08-31 07:55:17 +00:00
ykhung
8667ba61b4 Hide Camera background running time in the battery usage screen am: 2401ec4235 am: 24e8c1f902
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715976

Change-Id: I2e38aa777eb57b48991cc76f4b689e723710cc50
2021-08-31 07:28:35 +00:00
ykhung
24e8c1f902 Hide Camera background running time in the battery usage screen am: 2401ec4235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15715976

Change-Id: I19048e33376a9e9b0816f20a6e8fea60c4f46bcc
2021-08-31 07:13:58 +00:00
ykhung
2401ec4235 Hide Camera background running time in the battery usage screen
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background

Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
2021-08-31 07:01:01 +00:00
changbetty
bea12d4bbe Change the SIM color for passing the GAR
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-08-31 06:13:55 +00:00
Weng Su
81ab889df1 [automerger skipped] Don't show Wi-Fi icon if the level is -1 am: 1f6f807834 am: ef51aec905 -s ours am: e1c42823ec -s ours
am skip reason: Merged-In Ifddc9aace42d1f024b7c861b1207f651061d790b with SHA-1 1f6f807834 is already in history

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

Change-Id: Iaf62c4b35107ec8d082b1d727617beb5f8841be0
2021-08-31 03:41:05 +00:00
Weng Su
f89e30655c [automerger skipped] Don't show Wi-Fi icon if the level is -1 am: 1f6f807834 am: dc50ca86fb am: 1ddd133e16 -s ours
am skip reason: Merged-In Ifddc9aace42d1f024b7c861b1207f651061d790b with SHA-1 7e14668094 is already in history

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

Change-Id: I8f54fd6ffc6f8313925cc43f197dba51b6306d07
2021-08-31 03:40:55 +00:00
Weng Su
e1c42823ec [automerger skipped] Don't show Wi-Fi icon if the level is -1 am: 1f6f807834 am: ef51aec905 -s ours
am skip reason: Merged-In Ifddc9aace42d1f024b7c861b1207f651061d790b with SHA-1 1f6f807834 is already in history

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

Change-Id: I2ca1fd3df44f374031c546990ce57b7983a61b35
2021-08-31 03:31:19 +00:00
Weng Su
1ddd133e16 Don't show Wi-Fi icon if the level is -1 am: 1f6f807834 am: dc50ca86fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15720350

Change-Id: I6a2a26f74432e8e31f95ebc00e40000fd8d7f486
2021-08-31 03:30:44 +00:00
Weng Su
ef51aec905 Don't show Wi-Fi icon if the level is -1 am: 1f6f807834
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15720350

Change-Id: I9f8f1ed4d2ec8072dc3b7087d41186f021197e75
2021-08-31 03:21:50 +00:00
Weng Su
dc50ca86fb Don't show Wi-Fi icon if the level is -1 am: 1f6f807834
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15720350

Change-Id: Ib8e3164f046f2deeca88e6d31e29058789751edc
2021-08-31 03:21:47 +00:00
Weng Su
1f6f807834 Don't show Wi-Fi icon if the level is -1
Bug: 195893448
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: Ifddc9aace42d1f024b7c861b1207f651061d790b
(cherry picked from commit 7e14668094)
Merged-In: Ifddc9aace42d1f024b7c861b1207f651061d790b
2021-08-30 22:55:26 +00:00
TreeHugger Robot
0166f321c2 Merge "[Performance] avoid setting the same optimization mode again" into sc-v2-dev am: f3155c03f0 am: f5fe795a34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15712669

Change-Id: I982c82723e8ec3d79b149f09a6d8ddc0f7d21447
2021-08-30 11:13:00 +00:00
TreeHugger Robot
f5fe795a34 Merge "[Performance] avoid setting the same optimization mode again" into sc-v2-dev am: f3155c03f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15712669

Change-Id: Ic89e75098b40489f66005e1c6309e02c1b427552
2021-08-30 10:49:36 +00:00
TreeHugger Robot
f3155c03f0 Merge "[Performance] avoid setting the same optimization mode again" into sc-v2-dev 2021-08-30 10:28:11 +00:00
PETER LIANG
283dde2a7a Merge "Correct the position of the marker for audio adjustment." into sc-v2-dev am: 810ab566e7 am: c3b01abe59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15611717

Change-Id: I3672c19851b555ca10188d4fc57fbce54db01c04
2021-08-30 10:11:14 +00:00
ykhung
35bcab603b [B&R] restore the backup data for app optimization mode back am: adec23a106 am: ea57d6863e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15681503

Change-Id: If1af4c2d1671d1ae9976245a739878bbdf887211
2021-08-30 10:11:00 +00:00
PETER LIANG
c3b01abe59 Merge "Correct the position of the marker for audio adjustment." into sc-v2-dev am: 810ab566e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15611717

Change-Id: I75845cabf350a69a15bd1e9b99b1726b0a815bc8
2021-08-30 09:57:30 +00:00
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