Julia Reynolds
9372f3b4e3
Merge "Use NMS calculation of fixed importance" into tm-dev
2022-05-12 11:55:40 +00:00
Hugh Chen
8bae222489
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2
)
2022-05-12 06:11:48 +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
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
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
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
f39872bc18
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev
2022-05-11 03:02:52 +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
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
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
Martijn Coenen
d77f3426a2
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I6e942c241c734314246623b7521af6ebf9d2896c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:13 +00:00
Tsung-Mao Fang
7e6dd3f4b7
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: I97fb5d351bea43b6e7210bb856cd5c89d4ddc3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:40 +00:00
Bonian Chen
7dcd7194b4
Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985
Change-Id: Ie03543a38e7aee8b78e888ff842b1e807e953c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:18 +00:00
TreeHugger Robot
10190793fe
Merge "Hide running time for "Android System" in the optimization page" into tm-dev
2022-05-10 13:41:55 +00:00
Bonian Chen
812de51467
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev
2022-05-10 12:35:30 +00:00
ykhung
7015cd0dd9
Hide running time for "Android System" in the optimization page
...
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I9d44fe8490ad5c684419b8ebf8d7d5576a42788a
2022-05-10 18:47:44 +08:00
Hugh Chen
205752dcf2
Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
2022-05-10 09:47:19 +00:00
Martijn Coenen
63db54c290
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev
2022-05-10 09:18:52 +00:00
Tsung-Mao Fang
ca72e5c333
Merge "Disable setting items in App details page" into tm-dev
2022-05-10 08:17:57 +00:00
Chaohui Wang
61161eab14
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I789d73993aee19eeff574cd6e5d99714f48742f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 06:06:25 +00:00
Bonian Chen
b0e2411297
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I9c2056dfb62576bfc7dd87df6a1a58ef0aa7095e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:43:38 +00:00
Bonian Chen
d2c9581b44
[Settings] Broken test fix - SimStatusDialogControllerTest
...
Avoid from test broken - SimStatusDialogControllerTest
Bug: 232040460
Test: unit test
Change-Id: Id5cedd92f008df232234a19d9894e6eb8d39959d
2022-05-10 12:20:50 +08:00
Chaohui Wang
9b28ecf9de
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev
2022-05-10 02:44:47 +00:00
Bonian Chen
bd971968e9
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev
2022-05-10 02:25:51 +00:00
Bonian Chen
8b06c96fe9
[Settings] Hide some Preference entries when no mobile data support
...
Hide some Preference which requires mobile data on device didn't support
it.
Bug: 221999174
Test: local
Change-Id: I7dd6e13aea0ed4467c7c7edeada564e42ea78349
2022-05-10 01:12:23 +00:00
Julia Reynolds
f0ed87645c
Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96
am: c80fc1ba4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272
Change-Id: Id34ab31feb04fb25e7103623387b873906a94838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 21:21:09 +00:00
Julia Reynolds
c80fc1ba4d
Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272
Change-Id: I08f148210ade5545c070a88656909d4acb7becb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:40:45 +00:00
Julia Reynolds
23a85a1f96
Merge "Remove notification permission feature flag" into tm-dev
2022-05-09 20:16:09 +00:00
Bonian Chen
e0f1081739
[Settings] IMS feature checking before accessing VT IMS API
...
Check IMS feature before accessing VT IMS API.o
Bug: 231248315
Test: local
Change-Id: I01b438cc79bb91ca05ba6bf57c7e38eb06e51a98
2022-05-10 01:32:31 +08:00
Yuri Lin
3bb0f67d1f
Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a
am: e010ba619e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363
Change-Id: Iad024c7dd4d83546ba13727aaf17f28f01693ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:39:59 +00:00
Jason Chiu
99e01325bf
Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20
am: 399093f82a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097
Change-Id: I2bd9f24f858a74a1f311681f522e12bd1c7fb0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:33:27 +00:00
Yuri Lin
e010ba619e
Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363
Change-Id: I0bc4c2c71f364c813e9935d5b41343dabfbdd865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:29:04 +00:00
Tom Hsu
8ab642f71d
Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704
am: 927b6c4f63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645
Change-Id: Idfe3662ad408d5d7ff911df848a981bf75bd296c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:21:58 +00:00
Yuri Lin
9fb3262a1a
Merge "Change zen mode schedules page rule handling" into tm-dev
2022-05-09 14:56:13 +00:00