Commit Graph

117217 Commits

Author SHA1 Message Date
Bonian Chen
ad5b6855db [automerger skipped] [Settings][Back port] configuration for hidding SIM related UI am: bf55048799 -s ours am: 63034bfd38 -s ours
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: I44713e6c5058440dc5460c0b5530b21c68668b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:24 +00:00
Bonian Chen
47681935ac Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev am: 3423f0cb9b am: dbc0fc9e55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20267717

Change-Id: Ie1ebf0775a22d9fd28f75a40a0364fb620dd1b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:16 +00:00
Wesley Wang
5664ebc351 Merge "Add BatteryHistoricalLogUtil class" 2022-11-07 03:08:17 +00:00
Bonian Chen
63034bfd38 [automerger skipped] [Settings][Back port] configuration for hidding SIM related UI am: bf55048799 -s ours
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: Ia6b46142d09c9c582611f55318728e7562b4d233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:38:54 +00:00
Bonian Chen
dbc0fc9e55 Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev am: 3423f0cb9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20267717

Change-Id: I16263c928efba0b64d7316b65ab5adb028edc2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:38:49 +00:00
Bonian Chen
3423f0cb9b Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Arc Wang
3866acaea0 [automerger skipped] Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085 am: 76f12ccdca am: c8fd92dc66 -s ours
am skip reason: Merged-In I8b3b936de490f09f4be960fdafc6e66a1d858ee2 with SHA-1 3b1587d6b2 is already in history

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

Change-Id: If826cf1c9ee6ef8c0d247f406b4aad983b67d17f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 06:55:54 +00:00
Arc Wang
c8fd92dc66 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085 am: 76f12ccdca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I695908089058699e6cea14385c4261a69e821159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 06:23:27 +00:00
Arc Wang
76f12ccdca Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: Icb4fc96a1fe5903b7d09157d552c6782b6db2036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:56:25 +00:00
Arc Wang
241f207333 [automerger skipped] Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: bff1d6c14e -s ours
am skip reason: Merged-In I8b3b936de490f09f4be960fdafc6e66a1d858ee2 with SHA-1 3b1587d6b2 is already in history

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

Change-Id: I3e185c81c6b74854f0c824d3110ccababc17280f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:55:47 +00:00
Arc Wang
5292e9e085 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I66b28ac40ee6c50c10e51cff6844c17f91ac5e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:26:26 +00:00
Arc Wang
bff1d6c14e Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: Ifb26edc4549aa01324d6a4fe55150f61c35043c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:25:29 +00:00
Arc Wang
923ba5fcb2 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I766b9fa3ccd6c7d690275292b84efbddb19c651e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 04:23:18 +00:00
Joshua Mccloskey
21d9c6c796 [automerger skipped] Merge "Added intro lottie for foldable." into tm-qpr-dev am: bc38bacaf2 am: bd91183ac8 -s ours
am skip reason: Merged-In Ic9e95dd650dd5018d13751d251fdac53e1fb13d0 with SHA-1 9127c1192a is already in history

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

Change-Id: I4b07980e50ec186549fc6e3fd37a5058c80b1e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 19:58:57 +00:00
Joshua Mccloskey
bd91183ac8 Merge "Added intro lottie for foldable." into tm-qpr-dev am: bc38bacaf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20347039

Change-Id: I8d4a7381084408dbe2e9b670e251670c7b50e7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 18:56:24 +00:00
Joshua Mccloskey
bc38bacaf2 Merge "Added intro lottie for foldable." into tm-qpr-dev 2022-11-04 18:25:47 +00:00
TreeHugger Robot
1f41a637a2 Merge "Crop avatar to circle when syncing from Contacts." into tm-qpr-dev am: 057d24bb97 am: 56f9461b45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20347031

Change-Id: I9fd63455801f7dcd3da74f036aceb0e1f99765af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 18:17:14 +00:00
TreeHugger Robot
56f9461b45 Merge "Crop avatar to circle when syncing from Contacts." into tm-qpr-dev am: 057d24bb97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20347031

Change-Id: I67ce42b02907e02eda847497e37cb1aaa962e2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 17:07:58 +00:00
TreeHugger Robot
057d24bb97 Merge "Crop avatar to circle when syncing from Contacts." into tm-qpr-dev 2022-11-04 16:27:21 +00:00
Wesley Wang
d90026d184 Add BatteryHistoricalLogUtil class
- Impl optimize mode log mechanism to record optimize setup flow
 - Log optimize action with MANUAL, APPLY, RESET and RESTORE
 - Use proto file to serialize logs
 sample result: https://screenshot.googleplex.com/5KPrHVGb4pMvS7V.png

Bug: 241735485
Test: make SettingsRoboTests
Change-Id: I879663de4cf45d0cfb9cd7eee957eeb65addfbe1
2022-11-04 18:09:11 +08:00
TreeHugger Robot
cbdc66b767 Merge "Remove BatteryFixSlice as it's not used" 2022-11-04 09:06:05 +00:00
TreeHugger Robot
6fc971363b Merge "Add unaudited exported flag to exposed runtime receivers" 2022-11-04 08:13:28 +00:00
Bonian Chen
bf55048799 [Settings][Back port] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Change-Id: I709a8007362b09dbb1ec1bd5d32c68d23ed0cfa9
(cherry picked from commit 2b048b22f0)
2022-11-04 07:06:23 +00:00
Chaohui Wang
1b9f06c002 Merge "Fix some lint for Settings" 2022-11-04 05:28:46 +00:00
William Escande
07a8681f85 Merge "Fetch currently loaded bluetooth name" into tm-qpr-dev am: a364c8bacb am: dabdd6faa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378665

Change-Id: Ib66d0ba56cf9e4d12745673536208eb7cfef931a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 05:26:50 +00:00
William Escande
dabdd6faa9 Merge "Fetch currently loaded bluetooth name" into tm-qpr-dev am: a364c8bacb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378665

Change-Id: Id9ddd49d48825e90f8414360363ad85a0a5068cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 04:55:28 +00:00
William Escande
a364c8bacb Merge "Fetch currently loaded bluetooth name" into tm-qpr-dev 2022-11-04 04:27:18 +00:00
Yi-Ling Chuang
e3fcf1f082 Remove BatteryFixSlice as it's not used
The BatteryFixSlice hasn't been used for a while, and it's introducing
memory leaks due to a design change at the framework's end. Hence,
remove it.

Bug: 245385410
Test: robotests
Change-Id: I517cab71a32613d5cb5fcd3beb991a24926a2902
2022-11-04 12:22:56 +08:00
TreeHugger Robot
dd68d2a86c Merge "Guard FallbackHome activity behind permission" into tm-qpr-dev am: 7b63700b0b am: 9b1ccbcb74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064643

Change-Id: Iadbfa43226e0bbc4dc87525437148b6c6b53e848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 04:12:54 +00:00
TreeHugger Robot
9b1ccbcb74 Merge "Guard FallbackHome activity behind permission" into tm-qpr-dev am: 7b63700b0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064643

Change-Id: I944eaa6f1f6b166a5641d77209e92edd3aa3d71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 03:25:20 +00:00
William Escande
723df89aaa Fetch currently loaded bluetooth name
Test: m
ROBOTEST_FILTER="BluetoothMaxConnectedAudioDevicesPreferenceControllerTest"
RunSettingsRoboTests -j40

Test: m ROBOTEST_FILTER="com.android.settings.bluetooth" RunSettingsRoboTests
Test: Open developer settings
Bug: 257158801
Change-Id: Ib40a6264d8d6908103d76b6401ddcfd3ffa7dd88
2022-11-04 03:05:41 +00:00
Chaohui Wang
dbe73f6603 Fix some lint for Settings
Bug: 234570979
Test: Manually with Settings App
Change-Id: I4cd66be1df5499c070fd7f80caf9a5ab2873b93d
2022-11-04 11:01:41 +08:00
TreeHugger Robot
7b63700b0b Merge "Guard FallbackHome activity behind permission" into tm-qpr-dev 2022-11-04 03:00:05 +00:00
Joshua McCloskey
67c6ec3ef4 Added intro lottie for foldable.
Test: Verified lotties during fingerpritn enrollment flow.
Fixes: 246684274
Change-Id: Ic9e95dd650dd5018d13751d251fdac53e1fb13d0
Merged-In: Ic9e95dd650dd5018d13751d251fdac53e1fb13d0
2022-11-04 02:57:38 +00:00
Joshua Mccloskey
37e0ba9b97 Merge "Added intro lottie for foldable." 2022-11-04 02:57:18 +00:00
Joshua Mccloskey
eeb92a8cab Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev am: c4e603688e am: 6a5d3528d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378667

Change-Id: Ia88b3045e75f31e0a4590a085bf0b5436dfe7a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 01:57:21 +00:00
Joshua McCloskey
218bd88376 Updated sfps screen auth toggle. am: 7b58cadcfc am: e3162c2a6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378668

Change-Id: If15331d2536b92da0bdb71cb405462dbd8257df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 01:57:10 +00:00
Joshua Mccloskey
6a5d3528d6 Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev am: c4e603688e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378667

Change-Id: Ia13069fcb0141a4f92fff8c1fd203302c059063f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 01:24:54 +00:00
Joshua McCloskey
e3162c2a6b Updated sfps screen auth toggle. am: 7b58cadcfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378668

Change-Id: I5df9568f472562bdb2f80c36eb777913ce31323f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 01:24:43 +00:00
Joshua Mccloskey
c4e603688e Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev 2022-11-04 01:01:26 +00:00
Diya Bera
1181760b86 Remove "require screen on to auth" preference for Udfps
Fixes: 257272989
Test: N/A
Change-Id: Ic10bd02c7a26e58abcb471c3f495d65247f29edc
2022-11-03 22:29:10 +00:00
Joshua McCloskey
7b58cadcfc Updated sfps screen auth toggle.
Test: Verified toggle is on top of icon during fingerprint setup.
Fixes: 254923267
Change-Id: Id2f6444646201b6e4eca0c563984527776227ebb
2022-11-03 22:22:09 +00:00
Joshua McCloskey
9127c1192a Added intro lottie for foldable.
Test: Verified lotties during fingerprint enrollment.
Fixes: 246684274
Change-Id: Ic9e95dd650dd5018d13751d251fdac53e1fb13d0
2022-11-03 21:21:42 +00:00
Automerger Merge Worker
a2f95445dd Merge "Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae am: 6b156be280" 2022-11-03 18:34:23 +00:00
Behnam Heydarshahi
7a4f5b3216 Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae am: 6b156be280
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: I627b34d216c6e5139d49bc44830b36c3927eb502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 18:33:45 +00:00
Behnam Heydarshahi
bff773b41b Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae am: 6b156be280
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: If6e7bd4facd8a3bea6528b25767aed45e7175f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 18:33:40 +00:00
Behnam Heydarshahi
6b156be280 Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: I7321b1bfe1e7d89924b38cd6adf2853d336740d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 16:15:00 +00:00
Behnam Heydarshahi
2552ae08ae Merge "Read flag to show/hide notification slider" into tm-qpr-dev 2022-11-03 15:57:37 +00:00
TreeHugger Robot
4216bb90d7 Merge "Fix app battery usage list launch incorrect works app" 2022-11-03 14:02:34 +00:00
Wesley Wang
eda172ce2c Fix app battery usage list launch incorrect works app
- App usage page only use package name to launch the page, it can not
   identify the different userId between normal app and work profile
   app, add extra userId info into launch args
 - Remove no battery usage state/string if usage time is empty

Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
2022-11-03 11:32:30 +00:00