Commit Graph

43196 Commits

Author SHA1 Message Date
TreeHugger Robot
3ab05042dc Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 am: a00962e0c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Ida4ea18bc52ea8823a7e11579cb2b52b071d9eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:13:42 +00:00
TreeHugger Robot
a00962e0c7 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I028d9908e9510f2ae7cbebc36f9f23c0498155cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:56:37 +00:00
TreeHugger Robot
58cc75e217 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I9da420078509e6aa2a8ec37f1929fcdd5f2b4ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:54:53 +00:00
SongFerng Wang
a575d9bed0 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 am: 86fd225f79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I6146640d0aab0a0ff5d77aa7d9da4b6ae920032b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:40:51 +00:00
TreeHugger Robot
07db5f4362 Merge "Fix can't change notification sound for work profile." into tm-dev 2022-05-27 15:36:13 +00:00
SongFerng Wang
86fd225f79 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I76b7ecd27dcf6b1e682cc104a389c9653b31320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:26:31 +00:00
SongFerng Wang
d879d59a86 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I74352201ea603e7786ca6ee686fc9d6f142e7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:17:25 +00:00
SongFerng Wang
a67d5e25a3 Merge "[MEP] The removale slot can read the esim card" into tm-dev 2022-05-27 14:58:43 +00:00
Tsung-Mao Fang
40fbcf333f Fix can't change notification sound for work profile.
Use correct user id context to query the type,
so we won't get empty result unexpectedly.

If we get the null result, then we won't set sound sucessfully.

Fix: 233580016
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-05-27 21:13:33 +08:00
Chaohui Wang
7f7bc9a622 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 am: c20f0cabf7 am: 551549cf98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: I496d94b187a5394c076907dd4fc770baa50dc448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:56:21 +00:00
Chaohui Wang
7f6412b196 Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64 am: 4eaa0027e7 am: 0b3be6bd9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: I95cb82be28dd552bba798530ea3ca712a8c27d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:56:15 +00:00
Jason Chiu
7c75ca2953 Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172 am: b83449af1a am: fa6e470288
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: I369ac936a08247bc7dd61fc875ac61d51be45342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:56:08 +00:00
Chaohui Wang
551549cf98 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 am: c20f0cabf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: I80cdbf81ecfdd995c7ebd2838059828ac5caea95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:34:58 +00:00
Chaohui Wang
0b3be6bd9a Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64 am: 4eaa0027e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: I28c760ff5825b823fd94b277baa54d4f17cc0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:34:51 +00:00
Jason Chiu
fa6e470288 Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172 am: b83449af1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: I857211b2f211e54c83ac5457bb8878db44efc069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:34:43 +00:00
Chaohui Wang
c20f0cabf7 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: Ie214b97a1019488909831453470f0d250c11913f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:33:25 +00:00
Chaohui Wang
98429fbe65 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev 2022-05-27 10:29:51 +00:00
Chaohui Wang
4eaa0027e7 Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: Iec9150fcc43cac98b72e523be28f2dac79d90c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:17:40 +00:00
Jason Chiu
b83449af1a Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: Ic9302d7b34e827ca55f8cd14709d4e8710823b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:17:29 +00:00
Chaohui Wang
05f6617b64 Merge "Fix flicker for AppDataUsagePreference" into tm-dev 2022-05-27 10:13:41 +00:00
Jason Chiu
bd6107d172 Merge "Don't start two pane for singleInstance deep links" into tm-dev 2022-05-27 09:52:30 +00:00
SongFerngWang
18f10bb8b1 [MEP] The removale slot can read the esim card
Revert the wrong logic for removale slot part at ag/18579901,
the removable slot can read the esim card.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
2022-05-27 16:44:52 +08:00
SongFerng Wang
f93d0c2bc8 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 15c33001a2 am: af87b62083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: I3ff05011bc5157f82317ab70ba768742bad287a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 07:09:42 +00:00
SongFerng Wang
6b3b355975 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 15c33001a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: Id41eb349f1edf18d7f964b99e0887b12edc16620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:55:42 +00:00
SongFerng Wang
af87b62083 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 15c33001a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: I8bbfbd514c1c667134c3d798e477ea6d3e87faa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:55:41 +00:00
SongFerng Wang
15c33001a2 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: If3afab7ab294f3ce2836f96c12ba1d95dd82fbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:41:11 +00:00
SongFerng Wang
968da5c582 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: Idbd1cd2b051e08b2a284c98f2343ce6acfe3a2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:39:48 +00:00
SongFerng Wang
fa5407c60f Merge "Changing the condition since the esim may be removable" into tm-dev 2022-05-27 06:23:16 +00:00
Hank Sheng
73f37d3f3a Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91 am: 55e4e5d0e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I41379defe421d7b41dee13b88a2b67bca951f6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:03:25 +00:00
Chaohui Wang
60dbbc5f9d Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: caabb4fe49 am: 6737a44fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: Ib28e234c5b048342bd40a1c5c29cc301de540b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:03:17 +00:00
Hank Sheng
55e4e5d0e3 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Ifcef39885b565fbbdc950fe43c6b26d57e2bdcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:57 +00:00
Hank Sheng
3e3978ce80 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 0c8e9b6510
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I4f7589d5d38f61098468d37ad242b73f8af796c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:36 +00:00
Chaohui Wang
6737a44fba Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: caabb4fe49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I97d75ae94ed28e05698b516ef7e43d6c638c2b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:18 +00:00
Hank Sheng
349b36bb91 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id2d1766f508dd02f8412131c25f12f82d92a3833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:03 +00:00
Chaohui Wang
f9bfc59281 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: 4bcaccf8d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I1333dc9c30937b37a397138e69147e1b88286fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:01 +00:00
Hank Sheng
0c8e9b6510 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id4abc52bcccaec23a580f757b345c7d763ed1a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:46:43 +00:00
Hank Sheng
3dfcc708aa Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev 2022-05-27 05:32:47 +00:00
Chaohui Wang
caabb4fe49 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I348919ec56e2f4ba3a28db987b205cddeb44463a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:26:26 +00:00
Chaohui Wang
4bcaccf8d3 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: Ic1dcc095cf52be3495a4d4863d27fed25157c068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:24:54 +00:00
Chaohui Wang
bc2e0f5fc4 Merge "Fix unable to toggle off Pause app activity" into tm-dev 2022-05-27 04:59:46 +00:00
Chaohui Wang
c2dacf1b75 Fix flicker for AppDataUsage when zero usage
When the page is entered from the AppInfoDashboardFragment, there is no
way to know whether the cycle data is available before finished the
async loading. If it's zero usage, the cycle spinner will be removed,
which cause a flicker.

Temporarily disable the preference list's animator before initial
page updates can solve this issue.

This also fix another flicker on this page when the background data is
off.

Fix: 233963355
Test: manual visual test
Change-Id: I795ed95e15bb3216fa17adfd4f57faf5fd92fa00
2022-05-27 10:21:17 +08:00
Tom Hsu
c421f73232 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 019d251814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I73a3179f80439761e4af8e1b637d7d9b4341e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:39:20 +00:00
Tom Hsu
448ca95a7a Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I5c427bb1620b6f31657524c944c0ab01fc33452a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:07:39 +00:00
Tom Hsu
019d251814 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I16eef92f8fca756292ebade85c71601ac273bff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:07:36 +00:00
Tom Hsu
806582197e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:41:44 +00:00
Tom Hsu
90875efc90 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:40:10 +00:00
Tom Hsu
f6ea9c99b3 Merge "Fix wrong summary string show on the network page." into tm-dev 2022-05-26 15:06:00 +00:00
Jason Chiu
0c732f2a80 Don't start two pane for singleInstance deep links
If the activity's launch mode is "singleInstance", it can't be embedded
in Settings since it will be created in a new task.

Bug: 229371407
Test: adb shell am start -a android.settings.NETWORK_OPERATOR_SETTINGS
Change-Id: I1689d860151182cd9e97d9e4fd65d30a8804a570
2022-05-26 17:47:18 +08:00
tom hsu
d793e9512d Fix wrong summary string show on the network page.
Bug: 206742805
Test: local test, see b/206742805#4
Change-Id: I4fa9468e4f3b7d3671e383d3203b67636daa416c
2022-05-26 17:41:13 +08:00
Chaohui Wang
3a99f7c370 Fix flicker for AppDataUsagePreference
AppDataUsagePreference's title is sometime async loading, which cause
preference height change, which lead to page flicker.

Set a title placeholder before async loading to reduce flicker.

Fix: 187019210
Test: manual visual test
Change-Id: I26df832ab03a04641fd3d6eb678903ff3fe8820a
2022-05-26 17:36:45 +08:00