Commit Graph

13703 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
ccd8147776 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: Iba2eb763ef4599ad0073c024828a5ecffdfee8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:31:31 +00:00
Bonian Chen
33bc83f19e 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: I44235c6398195e24682857ccf5b292b4947e4b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:31:23 +00:00
Martijn Coenen
cf79b0fcf0 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: I033f09aaf7800e383de7a769b2e269b3ecf1c8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:31:08 +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
Tsung-Mao Fang
4e09433546 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: I81bf6663ec88a1de1578a38317031cdec9b912ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:24:05 +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
Chaohui Wang
02ddd9a642 Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f am: 22bdda8861
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I6bfd3464f77a215a541aeb64526f614b5088dbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 12:50:58 +00:00
Bonian Chen
09efd55ebb Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd am: 91a2f3c2a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I4fabf12c79d4ef7ed3ce927a75d50739b97eb20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 12:50:43 +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
Chaohui Wang
22bdda8861 Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I8e30238449dca001ccc6ac707fca89f55f1a4790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 09:46:13 +00:00
Bonian Chen
91a2f3c2a3 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I4238d8b00cfc59739ad22875621ae9e198310a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 09:46:00 +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
80e74b7f0f 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: I1348ca8869c1238a44f9a06dc278a6fae905d277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 06:26:08 +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
4c3dda2bbd 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: If7ce59c6a1557243d4e5f23fa3c1452ae7cb98e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:37:28 +00: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
73b08f15b0 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f5148fd0a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Icd76217fc4ee5059c9abbdc00cdbd8bd57937b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 23:28:41 +00:00