Bonian Chen
d2569ff16b
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp am: 525529c137
-s ours
...
am skip reason: Merged-In I8d7ddd18861a696830da39f040dfb14b9ed46726 with SHA-1 5dae24208b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271788
Change-Id: I6fe8b0179a7432ef93af9f48fe4ee7758559dbee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:56 +00:00
Bonian Chen
5cb0b4b8f4
[automerger skipped] [Settings][Back port] configuration for hidding SIM related UI am: 2b048b22f0
-s ours
...
am skip reason: Merged-In I8d7ddd18861a696830da39f040dfb14b9ed46726 with SHA-1 5dae24208b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271788
Change-Id: Ic2fc1dda8cba05e7da18519883bd0af0c3e24b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:55 +00:00
Bonian Chen
6e5d5f05db
[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp am: e3b5bda8aa
-s ours
...
am skip reason: Merged-In I07d9ddeb96ca590decf28126ce97fba4c1783304 with SHA-1 504e71c284
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271787
Change-Id: Ifa6481c3debe82a9e3482fc6373276cc9f184437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:53 +00:00
Bonian Chen
90b7ff7df2
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 02e4807229
-s ours
...
am skip reason: Merged-In I07d9ddeb96ca590decf28126ce97fba4c1783304 with SHA-1 504e71c284
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271787
Change-Id: Ifb7b079e1ab1bc57d784868d4199d9a51bf7fbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:52 +00:00
Bonian Chen
5382450ebe
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp am: f192a07988
-s ours
...
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271786
Change-Id: If11e77224cc97a0ed613e7b2be677fe8ca6c05df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:50 +00:00
Bonian Chen
79a29e9f3e
[automerger skipped] [Settings][Back port] configuration for hidding SIM remove UI am: f6114d3f83
-s ours
...
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271786
Change-Id: I25c41e551b303ca514b0888a0a0699ada4346d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:49 +00:00
Bonian Chen
7f8204647a
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp am: c5bd2f425b
-s ours
...
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265100
Change-Id: Ibe612d82b030b1d142568dd4e0724d8e0a8bd96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:47 +00:00
Bonian Chen
aba72c0814
[automerger skipped] [Settings][Back port] configuration for hidding SIM settings UI am: b4a8672dd9
-s ours
...
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265100
Change-Id: I06f60f2622f473c00d32946a298258f0fdf2dfa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:46 +00:00
Bonian Chen
6124464d58
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp am: 4c06b549bf
-s ours
...
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265099
Change-Id: I17fa1fca8a8fcc121cf2d4cc6a222b1f969f8a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:44 +00:00
Bonian Chen
b1cd705f5d
[automerger skipped] [Settings][Back port] configuration for hidding SIM lock UI am: 0466417c76
-s ours
...
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265099
Change-Id: Ia4449eda9e6c30d19bbad240c617ea575ab9d401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:43 +00:00
Bonian Chen
f5f55e21a0
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp am: a81f71ae46
-s ours
...
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265098
Change-Id: I8d63ec792086c5c10a9b223fca2d7311ba46c7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:39 +00:00
Bonian Chen
97de5d4beb
[automerger skipped] [Settings][Back port] configuration for hidding SIM provider UI am: 95dc65667e
-s ours
...
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265098
Change-Id: I7754e1b8dd88c972a79f3a3f3a342790fd7f96ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:33 +00:00
Bonian Chen
525529c137
Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
e3b5bda8aa
Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
f192a07988
Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
c5bd2f425b
Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
4c06b549bf
Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
a81f71ae46
Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
YK Hung
c91d3fa880
Merge "Add Zaiyue and I as the owners of battery usage."
2022-10-31 14:49:02 +00:00
Bonian Chen
bda2f43f7b
Merge "[Settings] Adjust the finish procedure when launching Settings UI"
2022-10-31 11:38:25 +00:00
TreeHugger Robot
7ced3c187d
Merge "Use correct menu key highlights for safety center" into tm-qpr-dev am: b0f38d29d2
am: dada288047
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209766
Change-Id: Ie4bec451717442032411cad912810cbfd7a69baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 11:24:47 +00:00
Chaohui Wang
1e45e38c02
Merge "Add AppAllServicesPreference for Spa"
2022-10-31 11:18:43 +00:00
TreeHugger Robot
dada288047
Merge "Use correct menu key highlights for safety center" into tm-qpr-dev am: b0f38d29d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209766
Change-Id: I33446534e0f76df00fe3e5fad0e8ac135afafc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 10:54:00 +00:00
Kuan Wang
68670cd883
Add Zaiyue and I as the owners of battery usage.
...
Test: NA
Change-Id: If768f53a11df687974706346157b75d5cce14a0e
2022-10-31 10:26:50 +00:00
TreeHugger Robot
b0f38d29d2
Merge "Use correct menu key highlights for safety center" into tm-qpr-dev
2022-10-31 10:04:02 +00:00
TreeHugger Robot
88313aed6c
Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev am: 3cb39ca221
am: 3ed6cb001b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20252603
Change-Id: Ic52873bd9940c0c8e60ab14bd617838c27d92916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 09:27:59 +00:00
TreeHugger Robot
bb17108f72
Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e7058
am: 155beb0610
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307409
Change-Id: I08bf5d2cdbd4a1e038af7c54468d39590f72e7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 09:27:40 +00:00
TreeHugger Robot
3ed6cb001b
Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev am: 3cb39ca221
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20252603
Change-Id: I78447f80bd4971eeb67395107a3731ccbcc18f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 08:53:45 +00:00
TreeHugger Robot
155beb0610
Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e7058
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307409
Change-Id: I87b186f17e8126638d5d09d6e9970b590d12ff6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 08:51:31 +00:00
TreeHugger Robot
3cb39ca221
Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev
2022-10-31 08:48:43 +00:00
TreeHugger Robot
58292e7058
Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev
2022-10-31 08:10:57 +00:00
Chaohui Wang
f73b79b841
Add AppAllServicesPreference for Spa
...
To try:
1. adb shell am start -n com.android.settings/.spa.SpaActivity
2. Go to Apps -> All apps -> [One App] -> All services
Bug: 236346018
Test: Unit test & Manual with Settings App
Change-Id: Ie491945c36487a5cea3fc64ad6108f3aa492b3b6
2022-10-31 15:51:46 +08:00
Bonian Chen
b4a8672dd9
[Settings][Back port] configuration for hidding SIM settings UI
...
Hide SIM settings UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Merged-In: I3d8b9b02998f09122a63f2262817acff3ca84d2e
Change-Id: I32169dc7d21164ca40297e75ca9122ecb9ade039
2022-10-31 07:09:37 +00:00
Arc Wang
812c7d7953
Merge "[Activity embedding] Fix unexpected finished 2nd layer problem"
2022-10-31 05:50:14 +00:00
Arc Wang
31eec49217
[Activity embedding] Fix unexpected finished 2nd layer problem
...
If Settings is started on an existing task, the existing SplitPairRule
may cause an unexpected app finish while navigating back from the
2nd layer page.
This change resets SplitPairRule in onCreate().
Bug: 247080168
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
manual
1. Settings app -> 'Connexted device'.
2. Launch Settings app again from Settings icon in quick Settings.
3. Start a 3rd layer from 'Network & internet'
4. Click back and see if the 2nd lay shows.
Change-Id: I262327cc49c3a4434a183eb00ac57f47fa598f70
2022-10-31 05:48:45 +00:00
Chaohui Wang
5396d8a129
Merge "No show AppButtons for system modules"
2022-10-31 05:08:02 +00:00
Zekan Qian
4c1b702c4f
Add Context in SpaEnvironment
...
Bug: 244122804
Test: manual - build Settings
Change-Id: I92b0e69a880d280776ab7f482aad3e06c72c3c03
2022-10-31 09:56:56 +08:00
Zoey Chen
77e38838a4
Merge "[Settings] Do not creat multiple database"
2022-10-30 13:17:25 +00:00
Lucas Silva
11a5067ee5
Update the "When to dream" settings am: 47d84b41ac
am: 0e7f4d87ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008
Change-Id: Id60e4ff240602ef42905a5af46f0ac77bde17f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 21:07:21 +00:00
Lucas Silva
0e7f4d87ce
Update the "When to dream" settings am: 47d84b41ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008
Change-Id: Id0ae8f8af81ab9cea7e61b1050e077afbe51a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 20:34:09 +00:00
Lucas Silva
47d84b41ac
Update the "When to dream" settings
...
For devices which don't support dreaming on battery, we can offer
simpler options since the device must always be charging for
screensavers to appear. Therefore there are only two options:
1. While charging
2. While docked and charging
Test: flashed and verified on device
Test: make -j64 RunSettingsRoboTests
Fixes: 226187572
Change-Id: I6ed24cda8874f2fb941f6cfded9ed97ed78a3cb6
2022-10-28 13:07:36 -04:00
Chaohui Wang
85cb46094c
Merge "Add AppSettingsPreference for Spa"
2022-10-28 12:53:12 +00:00
Chaohui Wang
5a89763503
Merge "Add AppDataUsagePreference for Spa"
2022-10-28 12:52:57 +00:00
Stanley Wang
a84b388272
Merge "Send pre-index intent when developer options changed" into tm-qpr-dev am: 18dd9b2307
am: 1be259b75a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307418
Change-Id: Id6588b0b654300b72639354cc4fa5eb60a517b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 12:16:21 +00:00
Stanley Wang
24d6e67a89
Merge "Send pre-index intent at Settings first started" into tm-qpr-dev am: 5ba309c5ad
am: cf38fb9701
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307417
Change-Id: Ia53d120a2e96760f60ed42fdebd706605a15c19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 12:16:19 +00:00
Stanley Wang
a56e2eb706
Add new api for search pre-index am: 22d1cdb3bf
am: 9f7094e47e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307416
Change-Id: I17d9477ad63c38c1cece30b9c029bc43d68cb363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 12:16:12 +00:00
Stanley Wang
1be259b75a
Merge "Send pre-index intent when developer options changed" into tm-qpr-dev am: 18dd9b2307
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307418
Change-Id: I2fbed4ebb333ef8a489dadc24147367754d50384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 11:19:08 +00:00
Stanley Wang
cf38fb9701
Merge "Send pre-index intent at Settings first started" into tm-qpr-dev am: 5ba309c5ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307417
Change-Id: I849c03cd70a2e5598d6b95cbaf2b4fcae5316831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 11:19:05 +00:00
Stanley Wang
9f7094e47e
Add new api for search pre-index am: 22d1cdb3bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307416
Change-Id: I0dc4b69c51ad4aad37ec37e059035564f02ca364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-28 11:19:02 +00:00
Zoey Chen
97291ac0ad
[Settings] Do not creat multiple database
...
Bug: 254405469
Test: manual
Change-Id: I96ea77899270439a87569bd1676d38b52dd36650
2022-10-28 11:07:39 +00:00