Mehdi Alizadeh
dfe74931a5
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: 634e0ac8b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I70f11a1461405518604e9bd1baaa856026927067
2020-06-16 23:27:30 +00:00
Mehdi Alizadeh
4d896e3da8
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I4b0d51bd2450f96d876ee00e78d59e6cbe0d8766
2020-06-16 23:27:27 +00:00
Mehdi Alizadeh
29e6eb0513
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I5e603aa831d709daa4de6a886b2e607410023c48
2020-06-16 23:27:05 +00:00
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
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
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
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
Alex Johnston
10c970c571
Wifi details - handle no profile owner
...
* If there is no profile owner, then do
no call DPM method getProfileOwnerAsUser
Bug: 158284193
Test: manual testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ief1f0b3aa6805d69fc14da8f87a90c9b12bef8c6
2020-06-16 11:05:33 +01:00
Sunny Shao
a92deac94d
Workaround for Recent app icon disappear
...
- Use the ic_home_xxxx.xml to replace the original icon.
Bug: 157623047
Test: manual review
Change-Id: Iffd084cac6a0a40d13d9fd1a8944ef957db450c6
Merged-In: I7a78ba47a0383a5e4c65bd461a15a8425beb1acb
2020-06-16 17:30:32 +08:00
Chihhang Chuang
ad249678d2
Launch WallpaperPicker in a new task am: 8bed8d3454
am: b080ef6c83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862433
Change-Id: Ic6ec7c2e69e345dde15ce56c1dfa432b90fd7c00
2020-06-16 09:22:08 +00:00
Chihhang Chuang
310b927d4a
Launch WallpaperPicker in a new task am: 8bed8d3454
am: d4ddbed638
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862433
Change-Id: I677c0949a8d76825b91aa5ac33489ffe7a679e7f
2020-06-16 09:17:57 +00:00
Chihhang Chuang
b080ef6c83
Launch WallpaperPicker in a new task am: 8bed8d3454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862433
Change-Id: Ic619bf5ac9f8f3e0b3f30f99871e98a006b154b1
2020-06-16 09:07:13 +00:00
Chihhang Chuang
d4ddbed638
Launch WallpaperPicker in a new task am: 8bed8d3454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862433
Change-Id: I074094686a8fabb286573dcc3329b706dd038635
2020-06-16 09:07:04 +00:00
Chihhang Chuang
8bed8d3454
Launch WallpaperPicker in a new task
...
Wallpaper does not support multi window mode, but launching from
Settings will make it support multi window because the root activity
supports.
Solution: Launch WallpaperPicker in a new task
Test: Manually
Fixes: 158642941
Change-Id: I93a6eaa8c0292e99c54d5278274482075ed007d5
2020-06-16 15:20:59 +08:00
Bill Yi
fe86f916e0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ib4ba0aa1024ba329e8877bd9ddbcb6f8f13db5ee
2020-06-16 05:26:00 +00:00
Bill Yi
22ed18f516
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Id87befbf347bce2fd31a66551b132a40b94f1edd
2020-06-16 04:45:42 +00:00
Chen Xu
9693bb414c
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
am: 3d2b11114c
am: ad3d76d953
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: I02056698608f47061e2f9b8518d505a22849bf18
2020-06-16 01:00:27 +00:00
Chen Xu
0a58bd83f5
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
am: 440939d8d3
am: 9dbb0177e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: Idbcc14c5137ff74b4b6c93f3cca60b2ad62a8489
2020-06-16 01:00:07 +00:00
Chen Xu
520d992715
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
am: 440939d8d3
am: b7547a5e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: I2287b0bebca99206464a533acb1e645572c9b44d
2020-06-16 00:59:57 +00:00
Chen Xu
b7547a5e5a
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
am: 440939d8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: I297a6578d1249471dec3fe90fcf466b5ac2e6a9a
2020-06-16 00:45:57 +00:00
Chen Xu
ad3d76d953
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
am: 3d2b11114c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: I2cc07476db21dafeddeb367403928d836adfb93c
2020-06-16 00:45:54 +00:00
Chen Xu
9dbb0177e6
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
am: 440939d8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: I74a79be92e1f6fb708efe62d79b7b95fbc2156be
2020-06-16 00:45:17 +00:00
Chen Xu
3d2b11114c
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: Ief61c9b120b69baeac985af1cfe60fdfc64bcf62
2020-06-16 00:30:03 +00:00
Chen Xu
440939d8d3
update description for string transaltion for IT-CMAS requirement am: 88e4c39e83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11874284
Change-Id: I873fb84c0a0ff3c543f3037c9137300de4f3bc8b
2020-06-16 00:29:56 +00:00
Chen Xu
88e4c39e83
update description for string transaltion for IT-CMAS requirement
...
Bug: 159062066
Test: Build
Change-Id: I14945535145721c3d035113c3fcba3222fc614b3
2020-06-15 15:42:53 -07:00