Mehdi Alizadeh
634e0ac8b3
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I55f36a667b7ce3d790a2a886a59c8add2e26b80c
2020-06-16 23:09:51 +00:00
Mehdi Alizadeh
eab293354a
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I022be22ccde5c45748b4e54e6974d1ccb41f3820
2020-06-16 23:09:36 +00:00
Mehdi Alizadeh
b50512b69a
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev
2020-06-16 22:53:25 +00:00
Automerger Merge Worker
80d3567d20
Merge "Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 7d991c6460" into rvc-qpr-dev-plus-aosp am: 4438930d2c am: 48de0d1ce7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Ia0145f99305448753f263f5e54dd1d2ffa43d93e
2020-06-16 20:48:46 +00:00
Alex Johnston
783a8efa7b
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: 1a9820c415 am: eebf47cdec am: 500ef83791 am: 426f772dd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I82c00dd8b907865014f8e0611b6ac8891e0d6eeb
2020-06-16 20:48:26 +00:00
Alex Johnston
e95907b65b
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 28e4b34ec7 am: 6f9115072a am: ff77ef91f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Icaecd449d3823d83d57b3220d4bce9ba7952870a
2020-06-16 20:48:02 +00:00
Automerger Merge Worker
48de0d1ce7
Merge "Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 7d991c6460" into rvc-qpr-dev-plus-aosp am: 4438930d2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I9e0c20eb5d6b4b0746cd679c9d9a8b3beb918aee
2020-06-16 20:31:54 +00:00
Alex Johnston
426f772dd5
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: 1a9820c415 am: eebf47cdec am: 500ef83791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I2c1136789e59eb31e63336077008686ad75b218b
2020-06-16 20:31:28 +00:00
Alex Johnston
ff77ef91f8
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 28e4b34ec7 am: 6f9115072a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I21c612959a9e408f1abea3175c9daa20bd10767f
2020-06-16 20:31:05 +00:00
Automerger Merge Worker
4438930d2c
Merge "Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 7d991c6460" into rvc-qpr-dev-plus-aosp
2020-06-16 20:10:41 +00:00
Alex Johnston
500ef83791
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: 1a9820c415 am: eebf47cdec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I84f00545e4a603efb816fcdbe43c0d7efcddace0
2020-06-16 20:10:36 +00:00
Alex Johnston
9dca10ea19
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 7d991c6460
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Ica03c027d0c0e45396c54cadf900a997d6405e3c
2020-06-16 20:10:35 +00:00
Alex Johnston
6f9115072a
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 28e4b34ec7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: If3ea251bca59ab5f5d665416b2b069c0243e41f2
2020-06-16 20:10:01 +00:00
Alex Johnston
7d991c6460
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Iee37736fca1db6cac3580b804e0045e9df57f4aa
2020-06-16 19:47:27 +00:00
Alex Johnston
eebf47cdec
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: 1a9820c415
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Iadf29f6056d7563cee6fd943291d42ea5320657f
2020-06-16 19:47:18 +00:00
Alex Johnston
28e4b34ec7
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I67cf0cf480b4baede6e47b8d7958d842282d8714
2020-06-16 19:47:02 +00:00
Alex Johnston
ec64a1d562
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I6fccaa22cd0c09008619b59a1b6c342c40d869f7
2020-06-16 19:21:58 +00:00
Alex Johnston
1a9820c415
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I3bb56b01b0a2459bf2c02f23723cc81b0f828cbe
2020-06-16 19:21:53 +00:00
Alex Johnston
dd1d9c4db0
Merge "Wifi details - handle no profile owner" into rvc-dev
2020-06-16 19:06:52 +00:00
TreeHugger Robot
d34ff7c78e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: 7032886561 -s ours am: f1363f7809 -s ours am: 3385955653 -s ours am: 8f5873e08d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: Ib3a8971fd6205cfaeddfa013274867e1c99527ea
2020-06-16 18:59:40 +00:00
Automerger Merge Worker
e02abc5392
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours am: 2d0c6b39f6 -s ours" into rvc-qpr-dev-plus-aosp am: 34f5952129 -s ours am: 38127f4d86 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: Iea286060f975293a3c07643ca3b184344b38e0f3
2020-06-16 18:59:00 +00:00
TreeHugger Robot
0e97b19dce
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours am: 55bc4d6226 -s ours am: c35940bf00 -s ours am: 17f01d4a8c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: Ib5e769ad3fef445ca48d4ccc11056d0e650ae665
2020-06-16 18:58:30 +00:00
TreeHugger Robot
5be8b8fee2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours am: 6a9b77b0f4 -s ours am: 21f8bda9c9 -s ours am: 216ec7eb69 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: I2ce3c109984a759609b5b0f5cb5454fbfbd121e3
2020-06-16 18:57:58 +00:00
TreeHugger Robot
04928b735d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours am: ea905acab7 -s ours am: e81966c8eb -s ours am: 98a41ffda7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: Iafdbe3468948adb6122befa2cb5742f3afca8eab
2020-06-16 18:57:39 +00:00
TreeHugger Robot
b3426e6064
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: ce1c7f578b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876509
Change-Id: I4a3f5588ffc9f7eac6546cb2e99627dbc02127f2
2020-06-16 18:56:56 +00:00
TreeHugger Robot
8f5873e08d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: 7032886561 -s ours am: f1363f7809 -s ours am: 3385955653 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I1e36f561e22c194fa0b61e0277e95eb818d110ae
2020-06-16 18:44:15 +00:00
Automerger Merge Worker
38127f4d86
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours am: 2d0c6b39f6 -s ours" into rvc-qpr-dev-plus-aosp am: 34f5952129 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: Ia5419324ed0887b31f938f03953071a16102c7fe
2020-06-16 18:44:08 +00:00
TreeHugger Robot
17f01d4a8c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours am: 55bc4d6226 -s ours am: c35940bf00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: Ifbb7e77cf60d98fd5276a37d978d3e1332228778
2020-06-16 18:43:54 +00:00
TreeHugger Robot
216ec7eb69
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours am: 6a9b77b0f4 -s ours am: 21f8bda9c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: I0def23b103491dcb422ce086fec06ce8c6b8288e
2020-06-16 18:43:39 +00:00
TreeHugger Robot
98a41ffda7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours am: ea905acab7 -s ours am: e81966c8eb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: I30d201bca21dd6934abb1c4b5dabbfe2f26064ea
2020-06-16 18:43:23 +00:00
TreeHugger Robot
ce1c7f578b
Merge "Import translations. DO NOT MERGE"
2020-06-16 18:38:28 +00:00
TreeHugger Robot
3385955653
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: 7032886561 -s ours am: f1363f7809 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I4dee73f6411e014471179692f962a94d011822df
2020-06-16 18:31:58 +00:00
Automerger Merge Worker
34f5952129
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours am: 2d0c6b39f6 -s ours" into rvc-qpr-dev-plus-aosp
2020-06-16 18:31:47 +00:00
TreeHugger Robot
049d92f6a0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours am: 2d0c6b39f6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I4cf677cdf793eaaa375a7ddea682dd2792861be1
2020-06-16 18:31:42 +00:00
TreeHugger Robot
c35940bf00
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours am: 55bc4d6226 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: Ibbfe65d78be393cf55440c0e3f05552c7041773f
2020-06-16 18:31:39 +00:00
TreeHugger Robot
21f8bda9c9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours am: 6a9b77b0f4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: If163752591586e0dfbca30260cf8a03a079cefd6
2020-06-16 18:31:29 +00:00
TreeHugger Robot
e81966c8eb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours am: ea905acab7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: Iefa5918bdc8ac19d67a67da4fb4d53118d47a5e4
2020-06-16 18:31:07 +00:00
TreeHugger Robot
f1363f7809
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: 7032886561 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I02788250d6562d3c15812c4215608ead77984088
2020-06-16 18:18:26 +00:00
TreeHugger Robot
2d0c6b39f6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I65e0be7cbebc20ea7c57e50a2c78af7df90ea470
2020-06-16 18:10:47 +00:00
TreeHugger Robot
55bc4d6226
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours am: aa702e7b68 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I335e69f62cb863d5c48cc806c38f92246e9306b5
2020-06-16 18:10:21 +00:00
TreeHugger Robot
6a9b77b0f4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: Iea517dafbc98b89f6aaa2bf4baac2d1daa5232d4
2020-06-16 18:10:15 +00:00
TreeHugger Robot
ea905acab7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: I30407fda8fed7bbcc5ebc7784662471072590d10
2020-06-16 18:10:04 +00:00
TreeHugger Robot
aa702e7b68
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I95e75a17db6e1dc47c7f258ed09223660ee363bb
2020-06-16 18:02:35 +00:00
TreeHugger Robot
7032886561
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I98cfcd706acd8f45cd80cfda62993316f03dfbbf
2020-06-16 18:02:26 +00:00
TreeHugger Robot
565af5abcf
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-06-16 17:59:57 +00:00
TreeHugger Robot
c622fdc7a9
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-16 17:40:13 +00:00
TreeHugger Robot
de4b5234cc
Merge "Add "Show taps" to development quick settings." am: 9e19b789ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11844674
Change-Id: Ia896798f4b12258802adb676b654db4ff183335b
2020-06-16 16:24:26 +00:00
TreeHugger Robot
9e19b789ec
Merge "Add "Show taps" to development quick settings."
2020-06-16 16:12:06 +00:00
Chihhang Chuang
786e814706
Launch WallpaperPicker in a new task[Part2]
...
Didn't notice com.android.settings.Settings$WallpaperSettingsActivity was also change unexpectedly, we should only add new task for CustomizationPickerActivity only.
Test: Manually
Fixes: 158642941
Change-Id: I9b271d0fbf124d2d38bc52fa99c2c17b0bfc658c
2020-06-16 18:38:04 +08:00
TreeHugger Robot
4387d19f18
Merge "Workaround for Recent app icon disappear" am: 2c9def7d89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862426
Change-Id: If29e17ba737f10b3bc10416629d2e3deb302e546
2020-06-16 10:14:19 +00:00
