Jason Chiu
26588fc2e5
Fix the work profile's deep link problem
...
- Settings shows the work Homepage while starting the work profile's
icon, which is not allowed.
- Clicking work apps' App info plays an unsmooth window transition
animation.
Fix: 233296965
Test: manual, robotest
Change-Id: I3d12f6c59692c4a4cc718ea7022b60be50235abb
2022-05-20 12:05:32 +08:00
SongFerng Wang
50ca1ab7fd
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002
am: d28816fcc3
am: db328a03fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870
Change-Id: Ic231c276f1f7726e35599bcdcfad4fcfd71ac3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 02:35:33 +00:00
Calvin Pan
9d6cf4255d
Merge "Avoid getting app locale config for each app" into tm-dev
2022-05-20 01:52:46 +00:00
SongFerng Wang
db328a03fb
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002
am: d28816fcc3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870
Change-Id: I82cf7c07333fced96063ce0653d37c7b9e6f346b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 00:49:21 +00:00
SongFerng Wang
d28816fcc3
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870
Change-Id: I4b1e2ca82609c4c37f74839ff1e404c428cdec8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 00:18:52 +00:00
SongFerng Wang
27b4578002
Merge "[LE unicast] Disable the "phone calls" when LE is enabled"
2022-05-19 23:56:08 +00:00
Bonian Chen
61038b77ee
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 1cdd01268a
am: 4b03edd4cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: I222680da686057f9cbad6933ef32f4650138c7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:40:48 +00:00
Bonian Chen
27e9d39b69
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 2034695af7
am: cbc5f8a756
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: I7756a5f71911627163fd08988ea8139a46affbc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:40:41 +00:00
Automerger Merge Worker
f033860c4c
Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 8bd1ac8ad2" into tm-d1-dev-plus-aosp am: 85f5fa0c01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: Ia74a026d3e54d3b887adc62601a1b684f7c001d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:40:23 +00:00
Bonian Chen
f2b70c1a08
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 2034695af7
am: d84a2b10f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: Idd1e9882cfc79eb31bfd0721be8a5c9874ee1a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:40:08 +00:00
Bonian Chen
32451865de
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 7e7ef59813
am: ec2b35fe87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I8458bbb1c361a8e38d96ae0c5874ef6d49ad8cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:40:00 +00:00
Bonian Chen
08628287f5
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 7e7ef59813
am: cb9e5a8076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: Ibe346fa196d8a71afba2c164c418d9fb43d1e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:39:53 +00:00
Bonian Chen
4b03edd4cc
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 1cdd01268a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: I5b880b2c38485830253a04b5b84902db1c8a5cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:25:08 +00:00
Bonian Chen
d84a2b10f8
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 2034695af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: I9a2e943ebe76959b4ba9f6cace61429876ff8c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:56 +00:00
Bonian Chen
cbc5f8a756
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
am: 2034695af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: Ie96d1ab046c988058dca50e0bfa8107d5babce8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:54 +00:00
Bonian Chen
cb9e5a8076
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 7e7ef59813
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I158f6542124f5260ddf64eddd589de654ff086b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:44 +00:00
Automerger Merge Worker
85f5fa0c01
Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 8bd1ac8ad2" into tm-d1-dev-plus-aosp
2022-05-19 11:24:36 +00:00
Bonian Chen
ec2b35fe87
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 7e7ef59813
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I4aff0efcc0bd667d952f23695d6c7db7dac85ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:32 +00:00
Bonian Chen
fd79110356
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
am: 8bd1ac8ad2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I2d2ea978b37da3ca0a2737ff5f267c5026132ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:24:31 +00:00
Bonian Chen
2034695af7
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: Id5e3b9d471b378a65c195179cac6da4b38e3723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:08:34 +00:00
Bonian Chen
7e7ef59813
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: Ie45deeea978e1a87b4d34e930bfd068a05f43ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:08:27 +00:00
Bonian Chen
1cdd01268a
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347
Change-Id: I7fd11293633fd718210bf59a83c5db28a12852f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:07:08 +00:00
Bonian Chen
8bd1ac8ad2
Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157
Change-Id: I390e0565a2ebfea00ad464117a63eec193fc6282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 11:06:42 +00:00
Bonian Chen
08b7f53383
Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev
2022-05-19 10:28:21 +00:00
Bonian Chen
fccca65c0e
Merge "[Settings] Stop network mode query when changing config" into tm-dev
2022-05-19 10:27:07 +00:00
Yi-Ling Chuang
3d15dd9f8b
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
am: 562977ee66
am: 4c592c3baf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: Iea79f9f9e7b5d8aecb8d4cfc5b269a1170fa9cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 09:47:53 +00:00
Yi-Ling Chuang
eb7afaa167
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
am: d16cf0453e
am: 07438e359d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: Ib6eb196cc4a3f617c440160896201169e43c2b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 09:47:30 +00:00
Yi-Ling Chuang
4bd95131c6
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
am: d16cf0453e
am: e8aaf2ba6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: I0b5f36f13dfabe114ffa88d74423e14c3e65573a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 09:46:41 +00:00
Yi-Ling Chuang
4c592c3baf
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
am: 562977ee66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: I4f7e7a14f83f2e18880978472aa71ac02ae37dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 09:21:07 +00:00
Yi-Ling Chuang
07438e359d
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
am: d16cf0453e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: I57ad7d8c54d8441b2dfa4daa2cf900bdae76914a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 09:20:51 +00:00
Yi-Ling Chuang
e8aaf2ba6f
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
am: d16cf0453e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: I8a7b1e0af688bfaaab35374bb7c1db1f881863ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 09:20:48 +00:00
Yi-Ling Chuang
d16cf0453e
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: Ic1c953a034827ce7df2bd7b0f464fdb340aebb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 08:44:38 +00:00
Yi-Ling Chuang
562977ee66
Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100
Change-Id: I4d7371583bd16123096f2e1bdeb71680aefa14c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 08:43:03 +00:00
Yi-Ling Chuang
3bf578c73e
Merge "Guard against the NPE in getTransitionType()" into tm-dev
2022-05-19 08:19:50 +00:00
SongFerngWang
5350643e7a
[LE unicast] Disable the "phone calls" when LE is enabled
...
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.
Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
2022-05-19 15:14:01 +08:00
Chaohui Wang
692068d535
Add the jank detection to Settings toggles
...
Add jank detection when click the following preferences,
- SwitchPreference
Single target, detect click in InstrumentedPreferenceFragment
- PrimarySwitchPreference
Two target, only detect click switch in switch's onClick()
- MainSwitchPreference
Single target, detect click in TogglePreferenceController
- SettingsMainSwitchPreference
Single target, detect click in its onSwitchChanged()
Bug: 230285829
Test: manual & robo tests
Change-Id: I97a13e05a601237b16cd2d903ba2fb6ec4a69a74
2022-05-19 12:28:16 +08:00
TreeHugger Robot
73850fc1be
Merge "[Le Audio] Add test case for the QrCodeScanModeActivity" into tm-qpr-dev am: ad6fc3acf5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18408202
Change-Id: Ib34a73395e4df59eb2d4e070dcf4bda4ccbf5726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 02:20:18 +00:00
TreeHugger Robot
ad6fc3acf5
Merge "[Le Audio] Add test case for the QrCodeScanModeActivity" into tm-qpr-dev
2022-05-19 02:02:11 +00:00
Bill Yi
3d21f9b287
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours am: fb624c7eb4
-s ours am: 9be6f3ac1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: If3cf124d5e4bdc32951826fac3862100c2370619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 02:01:58 +00:00
Bill Yi
9198d60e4c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours am: 8e72e0eff1
-s ours am: 72d01bba8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: I4aa23c204dc0dc113aaed67bd155f25aee316ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:59:32 +00:00
Automerger Merge Worker
1f400bc4cf
Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: daacf9d045
-s ours am: e7804305be
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66baefeaed
-s ours am: 163282414d
-s ours
2022-05-19 01:56:30 +00:00
Bill Yi
094f0d2f66
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours am: fb624c7eb4
-s ours am: 5c12bc3d5d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: I51dd8ccda33a8594cb12917fea1b14df2c44f115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:55:23 +00:00
Bill Yi
c6ff29f7ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: daacf9d045
-s ours am: e7804305be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219
Change-Id: I17b0d01acbf31596a8a7fb768b76af91cc14311f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:54:55 +00:00
Bill Yi
9f8f6063c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66baefeaed
-s ours am: 163282414d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219
Change-Id: I09ddb8e921072cd9aea470f52b82f5b81d0f36a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:54:24 +00:00
Bill Yi
5c12bc3d5d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours am: fb624c7eb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: If82bb75042093eb931bd38f94df704101dbe66be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:49:30 +00:00
Bill Yi
9be6f3ac1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours am: fb624c7eb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: Ibde279f87e103be53d608c2a114b0ad10a8961b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:47:40 +00:00
Bill Yi
c6c4152d7b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: daacf9d045
-s ours am: e3a01dbf3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219
Change-Id: I3838ef0573451c15720717d874b7fb9fef4ec0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:46:43 +00:00
Bill Yi
dc984245e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66baefeaed
-s ours am: c9122bbe1f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219
Change-Id: Ida080a829359033118edef201c6b79b2c13f9b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:46:25 +00:00
Bill Yi
72d01bba8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours am: 8e72e0eff1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: I4eb18bd9e45d24f23e1a50e45b74f0daf66667b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:37:26 +00:00
Bill Yi
fb624c7eb4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154
-s ours am: 72642fa03d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423221
Change-Id: I97435123dbc86b7aa1e8f590786e85c2d5ed8476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 01:37:10 +00:00