PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,820 Commits 1 Branch 0 Tags
011cdf6ef005da9c530d59791446c45e1adbc79c
Commit Graph

110820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4f30faa91c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b93416b26d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad18fe9860c68c39e3590c3e33b7dbd2b13bd60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 10:10:13 +00:00
Bill Yi
9e26f13061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef39119269 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6edfc370be502fd83a20e6f8a5be5b024f81d85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 10:09:52 +00:00
TreeHugger Robot
b93416b26d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-08 09:30:47 +00:00
changbetty
c706aa6108 Make bluetooth switch not discoverable via SliceDeepLinkTrampoline 
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk

Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
 2022-11-08 08:50:29 +00:00
Jason Chiu
2cbced55a4 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225ac3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450

Change-Id: I848120e8276098a0df41c2c1d8cea68682c21e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 05:02:35 +00:00
Jason Chiu
b9b1225ac3 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev 2022-11-08 04:34:19 +00:00
TreeHugger Robot
6d16483eee Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev am: a6e8ddda16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20383946

Change-Id: I381b2accad394334310db3b8b384fa4a114991a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 04:05:35 +00:00
TreeHugger Robot
a6e8ddda16 Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev 2022-11-08 03:34:11 +00:00
TreeHugger Robot
fec63bdb5b Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860

Change-Id: I68469b235bf57c254cfc9d5aaa8580e4f1abd141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 03:20:12 +00:00
TreeHugger Robot
19278b9477 Merge "Clean bluetooth code" into tm-qpr-dev 2022-11-08 02:37:30 +00:00
Jason Chiu
fb95451369 Reserve the icon space to avoid preference padding change 
If the injection icon is to be retrieved from a provider, the preset
transparent drawable is a 1x1 icon, which may cause the preference
padding change before and after the injection icon reloading.

Bug: 253471066
Test: robotest, visual
Change-Id: Ie88f69bb047a64a6a0ee30c060d8cbb8fe27b3d7
 2022-11-07 10:11:20 +00:00
Tsung-Mao Fang
70b8bd92c9 Fix NPE crash in TextToSpeechSettings 
Recyclerview's getItemAnimator() is nullable so we need a null check.

Bug: 254330134
Test: Manual
Change-Id: Iba5b0d68740c430fd1143d38ccf344afef486784
Merged-In: fa6a8e9767
 2022-11-07 05:43:40 +00:00
Bonian Chen
59969d6aab Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev am: af96b1ea7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269273

Change-Id: I614d5b67168449c865907a9f886796b13bb2da4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:39:07 +00:00
Bonian Chen
16b35935c2 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev am: 15f0cd6428 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269272

Change-Id: I2f92749b38bdcb9b5a4474a01d57fb18c51115a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:39:05 +00:00
Bonian Chen
8e69ab3dea Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev am: ab2e7bf6a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269271

Change-Id: Ic04d0df359dea768adbdab2d1ef745d62abcfa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:39:02 +00:00
Bonian Chen
72d697ad24 Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev am: 0eab03a862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269270

Change-Id: Ie19efee6f9bc6d949f670d4e59f990cef94edc64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:39:00 +00:00
Bonian Chen
b352ffc366 [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev am: 0b80576a34 -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: Idde859643c4cc069b5db5ca97b3ad9f72c5a8178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:38:58 +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
af96b1ea7a Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
15f0cd6428 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
ab2e7bf6a5 Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
0eab03a862 Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
0b80576a34 Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev 2022-11-07 02:05:50 +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
Bill Yi
ef39119269 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I41070a70d395daf355411c00a1e551d0e532671a
 2022-11-06 14:02:33 -08: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
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
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
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
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
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
Wesley Wang
8deb159e35 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
Merged-In: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
 2022-11-04 06:05:55 +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
24278d1609 Clean bluetooth code 
Fixing nit from Ib40a6264d8d6908103d76b6401ddcfd3ffa7dd88

Test: m ROBOTEST_FILTER="com.android.settings.bluetooth" RunSettingsRoboTests
Test: Open developer settings
Bug: 257158801
Change-Id: Id3521c423e5ab751633df627d113206f374fbe8e
 2022-11-03 21:31:17 -07:00
William Escande
a364c8bacb Merge "Fetch currently loaded bluetooth name" into tm-qpr-dev 2022-11-04 04:27:18 +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
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
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
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