Lifu Tang
bd4b23ba0d
Merge "Cache summary text to avoid flickering" into tm-dev
2022-05-12 14:57:31 +00:00
Julia Reynolds
da44b57637
Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
am: 2d251eaa2e
am: e4c2786e46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425
Change-Id: Id0bf25115412110f41cff9e90fc2d35d980a5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 13:14:06 +00:00
Julia Reynolds
e4c2786e46
Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
am: 2d251eaa2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425
Change-Id: Id48b84971ef57eed3352539021af0f077febc683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 12:50:06 +00:00
Julia Reynolds
265ac4148c
Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
am: 2d251eaa2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425
Change-Id: I215afd39c21e68812732bbc02f9178e621782995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 12:49:24 +00:00
Julia Reynolds
2d251eaa2e
Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425
Change-Id: I43fe4faf8494593743293333756a142d256eddf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 12:27:10 +00:00
Julia Reynolds
38addd9f8d
Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425
Change-Id: Ief0ddf880d27a11b693bd01a1a6f7c033b8b4cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 12:26:54 +00:00
Julia Reynolds
9372f3b4e3
Merge "Use NMS calculation of fixed importance" into tm-dev
2022-05-12 11:55:40 +00:00
Arc Wang
2001b2d0d1
Merge "Storage Settings crash" into tm-dev am: 241238c6df
am: 69bfb2ad1a
am: 0d9772691e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988
Change-Id: I41d6ad2cacfa3eafd38b38dec5600bec46220d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 05:07:19 +00:00
Yi-Ling Chuang
5117debec9
Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
am: 5cea4fc4a1
am: ab39e074a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655
Change-Id: I7af4a73a66934691a4cd93e77773445298b27d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 05:06:51 +00:00
Arc Wang
b3c53f061e
Merge "Storage Settings crash" into tm-dev am: 241238c6df
am: 0bfff4cabb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988
Change-Id: I2b72522a23f615d98d9a7e8a39eced04399e456f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 04:15:19 +00:00
Arc Wang
0d9772691e
Merge "Storage Settings crash" into tm-dev am: 241238c6df
am: 69bfb2ad1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988
Change-Id: I38409cf180177ffe2d143a0adae43167cb25c947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 04:15:13 +00:00
Yi-Ling Chuang
c1fd1de25b
Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
am: ccc866a16f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655
Change-Id: I87d58a374fc4afbc1c8d3e5ce47d1803cfd23b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 04:15:06 +00:00
Yi-Ling Chuang
ab39e074a3
Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
am: 5cea4fc4a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655
Change-Id: I8d07303307c667c956034fc38f634cd2e1ae7f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 04:15:02 +00:00
Arc Wang
69bfb2ad1a
Merge "Storage Settings crash" into tm-dev am: 241238c6df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988
Change-Id: Ib04a11d79b65cbbec0b005079aa45dc18186b37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:47:19 +00:00
Yi-Ling Chuang
5cea4fc4a1
Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655
Change-Id: I9cea804407d90ff8b7304d311031e25d1b340e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:47:04 +00:00
Arc Wang
0bfff4cabb
Merge "Storage Settings crash" into tm-dev am: 241238c6df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988
Change-Id: I477bd0fb6501ebc0162135d2802d3761ce1507ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:45:50 +00:00
Yi-Ling Chuang
ccc866a16f
Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655
Change-Id: I4d5346f3cc0764cb94aad41a19ccf52a6b0b0831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:45:30 +00:00
Arc Wang
241238c6df
Merge "Storage Settings crash" into tm-dev
2022-05-12 03:39:58 +00:00
Yi-Ling Chuang
f6c416054e
Merge "Make the force stop dialog work properly in split screen" into tm-dev
2022-05-12 03:23:11 +00:00
Lifu Tang
f29a071fca
Cache summary text to avoid flickering
...
Bug: 231927706
Test: build, flash, run unit test, then test manually.
Change-Id: Ia0585302c5cf86cd6035315fa750c71b9df55237
2022-05-11 15:52:23 -07:00
Julia Reynolds
2011588b16
Use NMS calculation of fixed importance
...
Rather than recalculating it again. Also align logic on
listing and details pages.
Test: NotificationBackendTest, NotificationPreferenceControllerTest
Bug: 231662091
Fixes: 231815850
Change-Id: If9572766666620008afb839ecb0828ace8d6073d
2022-05-11 16:38:04 +00:00
Weng Su
25b0db21ac
Get app label by launched package
...
- Activity#getCallingPackage will return null in some special cases, use the launched package instead.
Bug: 194709435
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanModeActivityTest
Change-Id: I4f22bab7592dedf75dd36daf5e18dbc934bc8655
2022-05-11 22:51:45 +08:00
Yi-Ling Chuang
2754a20c72
Make the force stop dialog work properly in split screen
...
When it's in a multi-window mode, force stopping an app will lead to an
activity recreate, and the dialog fragment will also be recreated.
That's why the dialog still shows after the button is clicked.
Hence, dismiss the dialog before stopping the app to fix it.
Fixes: 231529730
Test: robotest
Change-Id: I75d27624f0c60bb617e7d1a92ffe01d3c0fbf7be
2022-05-11 17:07:38 +08:00
Chaohui Wang
5a2f5ecff5
[DO NOT MERGE] Fix flicker for Data Usage page
...
Both "Mobile data usage" & "Non-carrier data usage".
By,
1. Use summary placeholder for usage amount to avoid shift
2. Before fix CycleListener's onItemSelected() is called multiple times,
cause the app list to flash, let DataUsageList to handle the dedup
logic to better handling.
3. Before fix if return from App Usage page, no loading view is
displayed (only first enter has it), move this to onResume() to fix.
4. Before fix the cycles passed to App Usage page is cached (even when
the cycles are changed), clear the cache when onResume() to fix.
5. Listener in SpinnerPreference could be null, add safety guard to it.
Fix: 187019210
Test: manual visual test
Change-Id: I95e544c46333496f4f30ed77dafa4779b4d66019
2022-05-11 17:02:54 +08:00
Arc Wang
87212cf504
Storage Settings crash
...
Storage settings will crash because there is no emulated primary volume found after private internal volume is Ejected.
Below change in Settings impacted Storage dashboard screen behavior as
it Query storage size instead of calculate size of installed APP. Due to
this design change now MediaProvider is queried for file sizes, but due
to unmounting of primary emulated volume it crashes.
We should not show Eject option for private Internal volume.
Author: ramneek.kalra@mediatek.com
Bug: 230689829
Test: atest com.android.settings.deviceinfo.VolumeOptionMenuControllerTest
manual
1. Insert sdcard or generate virtual disk using command : adb shell "sm set-virtual-disk true"
2. Go to Settings -> Storage -> Sdcard/virtual disk -> Format as Internal -> do migrate data
3. After above process completed, go to Settings-> Storage -> sd card/virtual disk and chose Eject menu option.
4. Eject page gets open, Click on Eject button.
Change-Id: I98d09f75ee7c2cd5aae10808bd0e0cdf10da7582
2022-05-11 13:57:33 +08:00
TreeHugger Robot
935fbe577e
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
am: 0fa209b89c
am: b53549a4c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: Ifed5031af5d1b50160d337daccb1ee1ddc1acf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 04:21:54 +00:00
TreeHugger Robot
b53549a4c5
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
am: 0fa209b89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: Ib7e0937ab4ae2e61664e69054d4f3db5ab91312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 04:07:40 +00:00
TreeHugger Robot
f53aeb97fd
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
am: 0fa209b89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: I668d1a7f8fd95b4f7ea65b589fd4c7c698e6772a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 04:07:32 +00:00
TreeHugger Robot
0fa209b89c
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: I683531b19121643ea5000d3bdd4344d0c7c9cfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:38:59 +00:00
TreeHugger Robot
ebd46572c4
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: I1d4d1936e6b5c5d556db078d2481c772826d1135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:37:25 +00:00
TreeHugger Robot
f39872bc18
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev
2022-05-11 03:02:52 +00:00
TreeHugger Robot
bfeff3bfc6
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
am: ccd8147776
am: 435a8ae837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Ibc8f16ad8dc14b91f2856108e6db82bc7925fd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:30:37 +00:00
Bonian Chen
9370dcd84d
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
am: 33bc83f19e
am: c8433b8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I4a1dda519fb7522703cf217d6ec00b8ee2ec37eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:29:30 +00:00
TreeHugger Robot
66e3dd58b5
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
am: 7e3c63dcd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: I4010429f19259c2c23f78c73591e51907d5a5623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:28:51 +00:00
Bonian Chen
89060986b6
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
am: 2a1040e1e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: Icc35b2c720705ab241362d21293082c21942b141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:28:25 +00:00
Martijn Coenen
85f1effe66
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
am: d77f3426a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I6c08f9736d1e497ce01379e83f2ab2827b75887b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:27:41 +00:00
Tsung-Mao Fang
c60a7e6109
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
am: 7e6dd3f4b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: I94f2e3ede5caf0bc20e8033b30c4501e1f005c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:26:56 +00:00
Bonian Chen
68f0010133
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450
am: 7dcd7194b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985
Change-Id: I749c9c8a14ee401af175a8c4fad295acf0a8ecfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:26:48 +00:00
Martijn Coenen
c696bdbaa4
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
am: cf79b0fcf0
am: ffef837a93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I2bfcae49748ec67f73e1582cbd94a81a36e599db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:20:17 +00:00
Tsung-Mao Fang
984cbd60ba
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
am: 4e09433546
am: 551d742d83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: Ia7c2fa6739d2b424601ef0f9d637095af7c91836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:19:26 +00:00
Bonian Chen
128df146c2
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450
am: 657a4f7549
am: aea13c2400
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985
Change-Id: I3340d34300a9e4a8d937b822aa2a805e3e7125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:54 +00:00
Chaohui Wang
bf652e736b
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de
am: 61161eab14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: Id7a976c328f4d18b0e1c55509e18d7275959b894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:17:41 +00:00
Bonian Chen
129c031930
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9
am: b0e2411297
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I78c11555c80bd7ead868925dc598640af78d6d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:17:29 +00:00
TreeHugger Robot
435a8ae837
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
am: ccd8147776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Iaa804c69d8744a07de575fd57c57eede2ca6a7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:33 +00:00
Bonian Chen
c8433b8435
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
am: 33bc83f19e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I979f44db2bc52cdef0b1e48a88457856a10cfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:04 +00:00
Martijn Coenen
ffef837a93
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
am: cf79b0fcf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: Id7e7b020df7b7ba22e82bf80ac1b541d915ca48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:03:14 +00:00
Tsung-Mao Fang
551d742d83
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
am: 4e09433546
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: Id8befe820b0df6bf057e952f56cc66a3d52ae4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:50 +00:00
Bonian Chen
aea13c2400
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450
am: 657a4f7549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985
Change-Id: Ie59e7070cd81c5bdfda61934f82b219f7b21e489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:38 +00:00
TreeHugger Robot
7e3c63dcd5
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: I550583e2fa4ba4c113760ca41caee4f499d76929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:52 +00:00
Bonian Chen
2a1040e1e2
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I1a7d0cd2e38b39da2b1873b2cb6161d5a50abb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:40 +00:00