Commit Graph

101571 Commits

Author SHA1 Message Date
Arc Wang
bbab9e1ad6 Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad am: 053a2cef0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: I7a12cb73cd02e264ad10a0506e6ae3f5b8b7a192
2022-03-18 06:35:48 +00:00
Arc Wang
053a2cef0c Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: Ieb67e4801430b3657e730de2fbb88714fe87dddb
2022-03-18 06:15:04 +00:00
Arc Wang
a21f277aae Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: Id15bae613192941fbeab31ba7ad8d7044e732370
2022-03-18 06:14:55 +00:00
Arc Wang
f8e0b152ad Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev 2022-03-18 05:56:51 +00:00
Daniel Huang
a027a2e94a Merge "[Panlingual][patch] Settings UI revamp - Navigation handling" 2022-03-18 03:51:56 +00:00
Jason Chiu
6393a30e03 Merge "Update the default split ratio" into tm-dev am: 3b1a9086a7 am: 8fabd76ced
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17226778

Change-Id: Ibf8490a2ffc5f8ec129660d76889b88649338e8a
2022-03-18 03:32:26 +00:00
danielwbhuang
b237247505 [Panlingual][patch] Settings UI revamp - Navigation handling
Fix the logic of checking mPreferenceKey

Bug: 223090378
Test: local
Change-Id: Iea9874463d1786fce2307f3db295ac2bdff27ac3
2022-03-18 03:29:05 +00:00
Jason Chiu
1628c8af0a Merge "Update the default split ratio" into tm-dev am: 3b1a9086a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17226778

Change-Id: I2337d13f1fe18820d3a04bcb0babc2374e2ae923
2022-03-18 03:25:20 +00:00
Jason Chiu
8fabd76ced Merge "Update the default split ratio" into tm-dev am: 3b1a9086a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17226778

Change-Id: I0bfdc83ad10b5f9e028e37411a5a21aec9540909
2022-03-18 03:15:27 +00:00
Jason Chiu
3b1a9086a7 Merge "Update the default split ratio" into tm-dev 2022-03-18 03:12:14 +00:00
Bill Yi
648c6cb277 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours am: d953313d3f -s ours am: 72651dd7a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4a6259578a0be1989cc65a8f75373fc3b3d8280
2022-03-18 03:03:46 +00:00
Bill Yi
465889ad4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours am: da9e66fe71 -s ours am: 697597bbdb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f2806d0f51b3b0bd570bac301ece1fda4ca6e06
2022-03-18 03:03:45 +00:00
Bill Yi
34164953e4 Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1 am: 65bd2f419f am: ec0f48658c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: I6e120cd56ad2c42ecc0e7ef9cf7b2dd46e5c3149
2022-03-18 03:03:37 +00:00
Bill Yi
b4223297c5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours am: 6adefff78e -s ours am: c2c8dd5df2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie892b6a8ece4b643727ea64f22511aee535544bc
2022-03-18 03:03:35 +00:00
Bill Yi
26c92108bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours am: 78abbdb6e4 -s ours am: 298650d578 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib99c1d53c5a69a5433707f74d2ca7663ab2e8ae9
2022-03-18 03:03:25 +00:00
Bill Yi
4f9a502079 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours am: 572d0be27b -s ours am: e786c64db4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac5826bfc7387b59f2544f2fc0787a56ceb2ef8b
2022-03-18 03:03:24 +00:00
Bill Yi
12c55d4a0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0980b77d42 -s ours am: feefbaaec9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43a3c8476f9a66064817d7f4991cb70c02c1d05f
2022-03-18 03:03:09 +00:00
Bill Yi
72a69d0c56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1575c5762c -s ours am: c353618b2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85c247758066b00f6db7beb9e9ccbc567f1b8d8b
2022-03-18 03:03:07 +00:00
Bill Yi
ca976eaba3 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev am: 2d8cc15ec7 am: e3385a5bc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624

Change-Id: I0cfae45baf51d91d5121ceeccbb90238e2a9c82e
2022-03-18 03:02:44 +00:00
Bill Yi
58f84a31ce [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc am: 33db44bfe7 -s ours am: ee1c029095 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If61001c4a69d4330f57ee710df6f27ac1ed4870f
2022-03-18 03:02:43 +00:00
Bill Yi
72651dd7a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours am: d953313d3f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23bcad8c2fb359bf76eef121f58b3a8bef2e737a
2022-03-18 03:00:22 +00:00
Bill Yi
817e1e934b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours am: c248a78d60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f96ec302df3528d097048df1ed1e8fcaa046e9c
2022-03-18 03:00:21 +00:00
Bill Yi
697597bbdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours am: da9e66fe71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcc28755f8a4c7ed207f16b0b1e0a90af2765c0b
2022-03-18 03:00:20 +00:00
Bill Yi
7371120da9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours am: 39de788383 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id18f209f0d346202c42331ae2f6fbcb97dea340b
2022-03-18 03:00:19 +00:00
Bill Yi
0893355b82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If65a9f9615a8e60877f279d5a105f0eefab9f6b9
2022-03-18 02:59:59 +00:00
Bill Yi
92e83d7e76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5579806c3b9ef8817f145892bbca7a8906e8c95
2022-03-18 02:59:58 +00:00
Bill Yi
ec0f48658c Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1 am: 65bd2f419f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: Ib7af429a05de931bd79cf8c66b702db4c4e19947
2022-03-18 02:59:45 +00:00
Bill Yi
c2c8dd5df2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours am: 6adefff78e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1405f0de1cb12e5741ab0b6229e90b9ecfd88d6
2022-03-18 02:59:44 +00:00
Bill Yi
d953313d3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d6008490cfe535514ef6d03d914a90024a63b53
2022-03-18 02:51:39 +00:00
Bill Yi
da9e66fe71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ded1f78ef71c9f174a50952ba99296b3ce0c851
2022-03-18 02:51:37 +00:00
Bill Yi
65bd2f419f Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: I9b5ba470dc8e40ddd7b7bbe5e0642565962edf5a
2022-03-18 02:51:29 +00:00
Bill Yi
6adefff78e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia844d632034948b5cc99ee21caaab7d9fe4ebccc
2022-03-18 02:51:27 +00:00
Bill Yi
75cce69c9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02a68c6262293bdcf21ec90dc7a96ac187041479
2022-03-18 02:50:07 +00:00
Bill Yi
c0e6019a32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61450277f98ace1bd9e3a9bb06244d18c0f627a8
2022-03-18 02:49:54 +00:00
Bill Yi
298650d578 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours am: 78abbdb6e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39ad518cab69d6f0fb1d2f24cec5b319f4264dfc
2022-03-18 02:44:34 +00:00
Bill Yi
e786c64db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours am: 572d0be27b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia57c9ca2bacd69b8280bdf75e6b5cfe32720fdeb
2022-03-18 02:44:32 +00:00
Bill Yi
feefbaaec9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0980b77d42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc9008e8b93aca4ac7f5788adfb3efe7a7add812
2022-03-18 02:44:09 +00:00
Bill Yi
78abbdb6e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3756535e8433e4f0826f4b5f8b61abf778cc495
2022-03-18 02:44:06 +00:00
Bill Yi
572d0be27b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26049202d9fc95dfb5aec181debd9bf690972a2d
2022-03-18 02:44:00 +00:00
Bill Yi
c353618b2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1575c5762c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddee08f13235485231e96c4331c080f44e3a1d89
2022-03-18 02:43:53 +00:00
Bill Yi
e3385a5bc8 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev am: 2d8cc15ec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624

Change-Id: Ia84f0a481eec762aa0342dbb49ae0df604b58267
2022-03-18 02:43:29 +00:00
Bill Yi
ee1c029095 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc am: 33db44bfe7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I758a1030f9798dbaecbc17a00633ec264a7cabc9
2022-03-18 02:43:27 +00:00
Bill Yi
c248a78d60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibeb1504a463f242b1e36a1f337cb77711dec4a23
2022-03-18 02:41:45 +00:00
Bill Yi
39de788383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45301965843deafdf9ae3e7cbc3b51bd7504d117
2022-03-18 02:41:44 +00:00
Bill Yi
18cb77b66a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-03-18 02:25:45 +00:00
Bill Yi
c0c5c066f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:25:29 +00:00
Bill Yi
e9439fc897 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-18 02:24:33 +00:00
Bill Yi
9b874759b1 Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b
  Import translations. DO NOT MERGE ANYWHERE
2022-03-18 02:24:27 +00:00
Bill Yi
0980b77d42 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-18 02:22:50 +00:00
Bill Yi
2d8cc15ec7 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc
  Import translations. DO NOT MERGE ANYWHERE
2022-03-18 02:22:40 +00:00