Chaohui Wang
6c090486a0
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
am: 7c74b9ba19
am: c47291950d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I4d3edbf2d143de3bd7f37203438542389b72fb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:24:00 +00:00
Chaohui Wang
c47291950d
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
am: 7c74b9ba19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I9d987aa0747b3b5079a64623ee187a0398a4e84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:02:56 +00:00
Chaohui Wang
7c74b9ba19
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I493a08683c8f5ae0998f04fdcb987aead4d3fe5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:39:08 +00:00
Chaohui Wang
9ada0accef
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev
2022-06-01 12:24:24 +00:00
Chaohui Wang
7cebd7959d
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
am: f34bac0ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I2d90540595b155fd0299725334c6179c6dc2d2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:29:13 +00:00
Chaohui Wang
f34bac0ee6
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I70b1572efb652df90ddaaa633e34cc8fad0e543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:06:41 +00:00
Chaohui Wang
596644171b
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I9c4aed2bb375a2b8b7836a139b1b01f64d235dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 02:51:43 +00:00
Chaohui Wang
71fe20ea8b
Merge "Fix flicker in Dark theme" into tm-dev
2022-06-01 02:35:51 +00:00
Amith Yamasani
bb2e561062
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
am: 390236115a
am: 6a4d79541a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I23449db027d5c663cb3dfe7a76211e0e92f87d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 13:00:44 +00:00
Amith Yamasani
6a4d79541a
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
am: 390236115a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: If31bb0c8c6927bd7eb7f0898d9afdf84af6b6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:39:59 +00:00
Amith Yamasani
390236115a
Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683
Change-Id: I69c616bb66f0a440e654fe8c324bd222d1b3e612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 12:25:01 +00:00
Chaohui Wang
9f6eaf8624
Fix flicker in Dark theme
...
Currently, when schedule sets to "Turns on at bedtime", the footer will
show a slid up animation when entering the page, this is because the
"Start time" & "End time" preferences are hidden in onResume().
This is because these 2 preferences always return AVAILABLE in
getAvailabilityStatus(), and manually update visibility in
refreshSummary(), which is called each time updateState() is called.
Usually the controller not set the visibility explicitly, but return
CONDITIONALLY_UNAVAILABLE in getAvailabilityStatus() when they want to
hide the preference.
Because getAvailabilityStatus() is called in onCreate(), by using this,
we can fix the flicker.
Fix: 234399017
Test: visual & robo test
Change-Id: I4cb7dd95d2985bd1ca4c8cb30aaebdc21a5415f8
2022-05-31 19:03:54 +08:00
Chaohui Wang
75e4028b3e
Clean up DarkUIInfoDialogFragment
...
The usage of this dialog is removed in
Change Ie2cf147de53385ae0c626c8472306f1b85317686
But this dialog is created (but not show) in DarkUIPreferenceController
each time dark mode toggle is turned on by user.
So clean this up.
Fix: 234419979
Test: make Settings
Change-Id: Icdc9d7a4fb77dc8b2a3f1a9d8e3f40fc0af4917d
2022-05-31 17:58:05 +08:00
Amith Yamasani
1b27c91a7b
Use Uri.toString() instead of Uri.toSafeString()
...
Uri.toSafeString strips out paths and shouldn't be used
for situations other than logging.
Bug: 232694281
Test: PtsPowerTestCases
Change-Id: Iec835b738c3e928e922bd6a14573106f2ce4f526
2022-05-30 23:22:25 -07:00
TreeHugger Robot
ca0b0e7ca2
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
am: 1340a91c73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I9ae683784754566b48e88d302b59f575fedca2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:14:26 +00:00
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
1340a91c73
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: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:56:19 +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
TreeHugger Robot
07db5f4362
Merge "Fix can't change notification sound for work profile." into tm-dev
2022-05-27 15:36:13 +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
2ff3a05456
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ied58d877d63ad065e783cadbf401589e065a0d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:53 +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
408728d4ab
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: I47ff02a503fd52cd79be438647d0f45c74c22a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:44 +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
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
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
SongFerngWang
948f512098
Changing the condition since the esim may be removable
...
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
2022-05-26 10:54:39 +08:00
Chaohui Wang
a64429b8e8
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 6c2ffc2220
am: 447f77c07d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Id2ae29ea35605664ecd672efe67252ecf3848924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:22:16 +00:00
Chaohui Wang
447f77c07d
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 6c2ffc2220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: I572044e99da299f73635c6a6008b376bfdca2fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:06:49 +00:00
Chaohui Wang
19847e69e3
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
am: 6c2ffc2220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: I5f042630f55ff9f7697f976007b6c402fd7093bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 15:06:49 +00:00
Chaohui Wang
6c2ffc2220
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Ic7dfd8258e5c2d0475d8365a3a4d740dc0f5baf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:49:37 +00:00
Chaohui Wang
0d415d7cc6
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Icdfbe0d9c4dae5cc561c65c01b01414611fa9783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:48:03 +00:00
Chaohui Wang
7dc1aec524
Merge "Fix Conversation page flickers" into tm-dev
2022-05-25 14:28:43 +00:00
Chaohui Wang
be86a0934d
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
am: afe4e239ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Ic2ca28fd2a3d2b0fdd26fc3f39ae00c52e8083c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:52:29 +00:00
Chaohui Wang
afe4e239ff
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Iad5922b6dc3be89883a2f2281bdda29fd16ac776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:35:24 +00:00
Chaohui Wang
4b8e64c294
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 39bd94e1e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Ie8392d6d732af7c1197d3cd5ab76900cca836c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:26:53 +00:00
Chaohui Wang
1484d1a472
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I51c7156ffdeaecd55464be761cb8d62203e8655d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:09:01 +00:00
Chaohui Wang
39bd94e1e5
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I4c87be62cf59f3fea0c17c3fb6f5564b0cfa75e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:07:31 +00:00
Chaohui Wang
02314870c7
Merge "Fix SeekBarPreference selectable test" into tm-dev
2022-05-25 10:50:48 +00:00
Chaohui Wang
6c4476b59f
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
am: 52a4269f9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Ia81eeb1da4efd3ce5460907e3b2084bd9c9f3894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:07:30 +00:00
Chaohui Wang
52a4269f9a
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Id9e665a5efb61b8baa60dce4c2fcaf5703d6897c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
79351944b8
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I804b3ccb98427f3104086a7b237913aba4011bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
635c506a92
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Id62102e910aa81346a986551244fb689c74aa0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:32:46 +00:00