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
Mehdi Alizadeh
2552dffe6e
Allows IndicatorView to have a different size than Settings Activity
...
The transparent IndicatorView need to be immersive fullscreen, while the
underneath activity should not cover the status bar or the nav bar.
Bug: 157747505
Test: Manual test to verify status bar and nav bar are visible.
Change-Id: I6d5a3f53dd3768524700c3e33135fa7dfde839f1
2020-06-15 14:30:39 -07:00
Automerger Merge Worker
613b684580
Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 12471d9484" into rvc-d1-dev-plus-aosp am: 569b3b1057
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I035cbe090fca681ffe2affd28b597b7d8d916818
2020-06-15 09:17:46 +00:00
Automerger Merge Worker
ac925a83b0
Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2
am: 1e591c16c2" into rvc-qpr-dev-plus-aosp
2020-06-15 09:17:42 +00:00
Automerger Merge Worker
2a33b85f57
Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2" into rvc-d1-dev-plus-aosp am: efa8cb6206
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I8c4db2e382e6dd128d7abbf6e05b91a38e7fa713
2020-06-15 09:17:38 +00:00
Amy Hsu
5614c4f3f4
Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2
am: 1e591c16c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I454e4205bd551f15acebc6cdbbb98d24ef5d54fe
2020-06-15 09:17:37 +00:00
Automerger Merge Worker
619da0e5ad
Merge "Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7
am: 087ec3447d
am: 867adf2a5e" into rvc-qpr-dev-plus-aosp
2020-06-15 09:17:34 +00:00
Automerger Merge Worker
8e93096839
Merge "Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7
am: 82e9a3d251" into rvc-d1-dev-plus-aosp am: a8176f3fb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838400
Change-Id: Ibbd5886a56862f3fc449254626415b620b0770b0
2020-06-15 09:17:29 +00:00
Rubin Xu
bcde175e9c
Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7
am: 087ec3447d
am: 867adf2a5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838400
Change-Id: I07478c697cf47469a6567e1b6b010b742e091c66
2020-06-15 09:17:27 +00:00
Rubin Xu
bdf303f0d1
Merge "Remove password shards from memory" into rvc-dev am: 01bd0fcaf7
am: 087ec3447d
am: 634cdf3825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838400
Change-Id: Ia5e8ead109b5b0020fa45684c9641d7e044b8e51
2020-06-15 09:17:15 +00:00
Automerger Merge Worker
569b3b1057
Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 12471d9484" into rvc-d1-dev-plus-aosp
2020-06-15 09:00:13 +00:00
Automerger Merge Worker
efa8cb6206
Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2" into rvc-d1-dev-plus-aosp
2020-06-15 09:00:08 +00:00