Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,344 Commits 1 Branch 0 Tags
bc00cbb90043a2ef7325ade2d236a0987568f17a
Commit Graph

103344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bc00cbb900 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214802

Change-Id: I395c2cf49d31635f61de481e9f0fb69d29141e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:34 +00:00
Bill Yi
66101cee32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210276

Change-Id: I7b3ea867cdce14ea1cc640daadbe5d6f1cef7915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:16 +00:00
Bill Yi
834950e817 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210276

Change-Id: I0cbcd3b23e9d7064304c6e399e1901caf5449b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:02 +00:00
TreeHugger Robot
a6e210ff8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: f8181ea933 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214812

Change-Id: I632d24168c822a628be984329b92092fd5fd7ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:40 +00:00
The Android Open Source Project
379f19fb30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 9db4d03357 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214812

Change-Id: Ice5d6b5acbd36f34f1479b38c10c721f58621404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:38 +00:00
TreeHugger Robot
defb287459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 176fb51f4f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808

Change-Id: Ic3f7c058e9817498993dc841a7ea2b02c0f0c991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:35 +00:00
The Android Open Source Project
44bf820478 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 0e3016543c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808

Change-Id: I241ffe0a108faaaf71d73974f5264a0705b2862e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:27 +00:00
TreeHugger Robot
8348e67936 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: ab1590098a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279

Change-Id: Ic79661bf9ca113631aea4cffb4f7908bfb921937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:21 +00:00
Bill Yi
03e09d6366 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 54784f7246 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279

Change-Id: Ibec5d89bc4fd96a288890bbc43828543ed07afc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:10 +00:00
TreeHugger Robot
2825fdf175 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 89707b8827 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272

Change-Id: I30db5a72651d5f60373d56d595facf8651775cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:11:56 +00:00
Bill Yi
6921b850c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: 44717d3500 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272

Change-Id: I2f7a49df88aa8152d87281ce41eb6130b6bbfab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:11:46 +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
Automerger Merge Worker
78fa65b2be Merge changes from topic "am-38c2777666e34c669ef9b159b634e16f" into tm-d1-dev-plus-aosp 
* changes:
  Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours
 2022-05-10 21:05:15 +00:00
Yanting Yang
604c3c3f22 Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 7031c01a9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: Ib554be5157dd5cb5d39902eb75b71fa2490d62df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:04:09 +00:00
TreeHugger Robot
ade25b3d36 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I3145ff5669671b4f26f4d7072591dcdf76f201f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:03:52 +00:00
Bill Yi
22623e17a7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: Id3e8a34f2782bd5286847400ec4b69c041d69a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:03:45 +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
Menghan Li
56665fb64f Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: 347aa6f934 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: I29a3b5d27fc77ecb1ebc5bb76fd8ee32e27d8fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:02:38 +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
241baf7389 Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 31b30c123c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: Iceff0b60a1a44cee4c18bc8145f69ee98877a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:01:30 +00:00
SongFerng Wang
4f0d8249a9 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 992e20d2af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: Ic6fe5a86bf53a1dc67100152dd30199d4d2b97df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:01:15 +00:00
Chaohui Wang
708e5e6ab4 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: b36e15c613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I81aa8524cbe16d0d64b1a30c4669db72d9f1980e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:01:06 +00:00
TreeHugger Robot
f8181ea933 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214812

Change-Id: Ifbcca144c108c1709dd492de0a03d9e54939138b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:36:02 +00:00
The Android Open Source Project
9db4d03357 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214812

Change-Id: I4c3250c78f5f1a73c89c6fc1758eaeb35c6b2a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:35:47 +00:00
TreeHugger Robot
176fb51f4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808

Change-Id: I01039a5ec2ca4703abcaddd228487d04b9e8e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:35:45 +00:00
The Android Open Source Project
0e3016543c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214808

Change-Id: Ifd28966e0291d3423afdbb04914a7e38229ee0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:35:44 +00:00
TreeHugger Robot
ab1590098a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279

Change-Id: I563f7cc92fbdf7b7623fb9a90f431a476f06186d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:35:35 +00:00
Bill Yi
54784f7246 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210279

Change-Id: Ib7c5778d81d69f7a77284ba821b37d41f3dc4aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:35:15 +00:00
TreeHugger Robot
89707b8827 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272

Change-Id: Iec9507e641c034361f7718e33e05e882bf96853a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:35:02 +00:00
Bill Yi
44717d3500 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210272

Change-Id: I0b65a2f3454a8adce9b28322bc5c62298760dea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:34:54 +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
Yanting Yang
7031c01a9c Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: I63a74eece6489253bc76c2578c125f1f6e2451fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:31:16 +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
Menghan Li
347aa6f934 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: I56d876311ce7a625e69dc3315d1ee3074519ceb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:31:01 +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
Bonian Chen
657a4f7549 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: I027d1e0e7ed8168a3ce677c2b901aa2747c24eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:23:27 +00:00
TreeHugger Robot
31b30c123c Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: I21114cb9c3a52a23854f836a120b812f94c923ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:23:18 +00:00
SongFerng Wang
992e20d2af Merge "Reuse the active esim slot" into tm-dev am: b1613b210d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I64749537cb7fa639c7ce6dd1ed76e15a0a969cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:22:41 +00:00
Chaohui Wang
b36e15c613 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: Icbc2a7520a49da31df63e0b73b8cb00c005cb1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:22:29 +00:00
TreeHugger Robot
fbbd1f1109 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +00:00
TreeHugger Robot
3ffe35d0df Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +00:00
TreeHugger Robot
1b42795ed4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +00:00
TreeHugger Robot
8e13f26686 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +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
Yanting Yang
51204e3deb Merge "Fix reset app preferences for work profile apps" into tm-dev 2022-05-10 12:25:59 +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