Automerger Merge Worker
8e704f82f0
Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
am: 66c9a88946"
2022-05-30 05:05:33 +00:00
Treehugger Robot
5b4ca8e8ba
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
am: 2341b91f32
am: 22c4b4009b
am: 7cf2c08b53
am: 9d92574250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I62207f8eafb3839c984d11b73bdf2f18d14199a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 05:05:14 +00:00
Edgar Wang
385243d7f3
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
am: 66c9a88946
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: Ia4a1b520c3f14593a81a0435c07b1d0b35c06e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 05:05:00 +00:00
Treehugger Robot
9d92574250
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
am: 2341b91f32
am: 22c4b4009b
am: 7cf2c08b53
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I2a2d7758da7c9e8484377ecb2a6c5bdc128f2566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 04:34:58 +00:00
Edgar Wang
610538e10b
Merge "Enable hyphenation on most of preference." into tm-dev
2022-05-30 04:00:19 +00:00
Treehugger Robot
7cf2c08b53
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
am: 2341b91f32
am: 22c4b4009b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I68e18d34ee0f28caac1da18f76472082eb524430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 03:59:47 +00:00
Treehugger Robot
22c4b4009b
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
am: 2341b91f32
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I1fd069da08f2931ee00c7adb08df56fc4fb976b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 03:44:42 +00:00
Chaohui Wang
628abd67a5
Merge "Enable Kotlin for Settings App" into tm-qpr-dev am: 304a3fd37e
am: f46186a820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18655752
Change-Id: I25466af097e46b4238db152f5003e75615b2257e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 03:28:33 +00:00
Treehugger Robot
2341b91f32
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I3435e3bf2ee61ad4be971334f791543d9c26856d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 03:27:45 +00:00
Chaohui Wang
f46186a820
Merge "Enable Kotlin for Settings App" into tm-qpr-dev am: 304a3fd37e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18655752
Change-Id: Ieb38157536c1cb746de007ac2c162e9336a3288f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 03:01:34 +00:00
Treehugger Robot
24f96c2c2e
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info"
2022-05-30 03:01:23 +00:00
Chaohui Wang
304a3fd37e
Merge "Enable Kotlin for Settings App" into tm-qpr-dev
2022-05-30 02:43:23 +00:00
Chaohui Wang
9ec6f0e41a
Enable Kotlin for Settings App
...
Currently Kotlin files cannot build with library app-compat-annotations.
Only one @ChangeId need this library, create separate build target
library Settings-change-ids to solve this issue.
After this cl, Kotlin could be used for Settings App.
Fix: 229037247
Test: make Settings
Change-Id: I4a0d99425c9e6cc2cbc015d2561daa68609ca0fd
2022-05-30 01:58:25 +08:00
TreeHugger Robot
ca0b0e7ca2
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
am: 1340a91c73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I9ae683784754566b48e88d302b59f575fedca2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:14:26 +00:00
TreeHugger Robot
1dd874906b
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
am: 84afa101d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I700c596bc9a835eb9531997044651ecacc014895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:13:51 +00:00
TreeHugger Robot
3ab05042dc
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
am: 58cc75e217
am: a00962e0c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: Ida4ea18bc52ea8823a7e11579cb2b52b071d9eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:13:42 +00:00
TreeHugger Robot
a00962e0c7
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
am: 58cc75e217
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I028d9908e9510f2ae7cbebc36f9f23c0498155cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:56:37 +00:00
TreeHugger Robot
1340a91c73
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:56:19 +00:00
TreeHugger Robot
58cc75e217
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I9da420078509e6aa2a8ec37f1929fcdd5f2b4ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:54:53 +00:00
SongFerng Wang
a575d9bed0
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: d879d59a86
am: 86fd225f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I6146640d0aab0a0ff5d77aa7d9da4b6ae920032b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:40:51 +00:00
TreeHugger Robot
07db5f4362
Merge "Fix can't change notification sound for work profile." into tm-dev
2022-05-27 15:36:13 +00:00
SongFerng Wang
b5bc3952c5
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: e4d42c1515
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: Ie73fca56e20e0c70230ff6823eba12ff63c208f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:33:56 +00:00
SongFerng Wang
0a6ea7f85f
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: 716c801f6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I0d36259fd473eafe9221a559acc5890121795440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:33:23 +00:00
SongFerng Wang
86fd225f79
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
am: d879d59a86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I76b7ecd27dcf6b1e682cc104a389c9653b31320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:26:31 +00:00
SongFerng Wang
e4d42c1515
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I4c163ea303beefcf265ba6b67585d7559aab9ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:44 +00:00
SongFerng Wang
640e337b19
Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797
Change-Id: Idcc44c3a8d41c74cb485c5cba0764989adc17a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:30 +00:00
SongFerngWang
5de8fbc299
Changing the condition since the esim may be removable am: 82bf2a66b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: If58f4e897785dd92ed6de2bd847bb5a7a9728294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:28 +00:00
SongFerng Wang
d879d59a86
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I74352201ea603e7786ca6ee686fc9d6f142e7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:17:25 +00:00
SongFerng Wang
d3a7c75487
Merge changes Ic2ac6a5c,I47dc068e
...
* changes:
[MEP] The removale slot can read the esim card
Changing the condition since the esim may be removable
2022-05-27 14:59:48 +00:00
SongFerng Wang
a67d5e25a3
Merge "[MEP] The removale slot can read the esim card" into tm-dev
2022-05-27 14:58:43 +00:00
Betty Chang
e300781fb8
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 14:47:51 +00:00
Tsung-Mao Fang
40fbcf333f
Fix can't change notification sound for work profile.
...
Use correct user id context to query the type,
so we won't get empty result unexpectedly.
If we get the null result, then we won't set sound sucessfully.
Fix: 233580016
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-05-27 21:13:33 +08:00
Chaohui Wang
7f7bc9a622
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: c20f0cabf7
am: 551549cf98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I496d94b187a5394c076907dd4fc770baa50dc448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:21 +00:00
Chaohui Wang
7f6412b196
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 4eaa0027e7
am: 0b3be6bd9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I95cb82be28dd552bba798530ea3ca712a8c27d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:15 +00:00
Jason Chiu
7c75ca2953
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: b83449af1a
am: fa6e470288
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I369ac936a08247bc7dd61fc875ac61d51be45342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:56:08 +00:00
Chaohui Wang
2ff3a05456
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: 408728d4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ied58d877d63ad065e783cadbf401589e065a0d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:53 +00:00
Chaohui Wang
71961276bd
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 7f4341f9aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I5c6bbd8f0ab3f816492bcf1ecaf34a9acbcd3c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:45 +00:00
Jason Chiu
9ac3a4c795
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: aaa3ad0890
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I16bdab3cae1f85976e34b8e0ce781cd2397a837d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:42:28 +00:00
Chaohui Wang
551549cf98
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: c20f0cabf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I80cdbf81ecfdd995c7ebd2838059828ac5caea95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:58 +00:00
Chaohui Wang
0b3be6bd9a
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 4eaa0027e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I28c760ff5825b823fd94b277baa54d4f17cc0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:51 +00:00
Chaohui Wang
408728d4ab
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I47ff02a503fd52cd79be438647d0f45c74c22a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:44 +00:00
Jason Chiu
fa6e470288
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: b83449af1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I857211b2f211e54c83ac5457bb8878db44efc069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:43 +00:00
Chaohui Wang
25fd957190
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
am: b5b436b420
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: I8644936ef0941e53b0d30cd100c5a823ef5d7b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:28 +00:00
Chaohui Wang
fec030ac2a
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
am: 14fb9deb8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I79bbdb33d3556d48fb19c5384d227c96737fa566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:20 +00:00
Jason Chiu
4b25af3766
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
am: c003fd2688
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I5dedef2e67aa2ea2d4259f1a94cbb919da4fe70b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:34:08 +00:00
Chaohui Wang
c20f0cabf7
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746
Change-Id: Ie214b97a1019488909831453470f0d250c11913f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:33:25 +00:00
Chaohui Wang
98429fbe65
Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev
2022-05-27 10:29:51 +00:00
Chaohui Wang
7f4341f9aa
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: I98bd7e8de5893d0f39fe91c99472346a3a9cadae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:18:53 +00:00
Jason Chiu
aaa3ad0890
Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833
Change-Id: I62b60adb13e8068ef8c16aef67ef01c2ad988161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:18:46 +00:00
Chaohui Wang
4eaa0027e7
Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832
Change-Id: Iec9150fcc43cac98b72e523be28f2dac79d90c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 10:17:40 +00:00