Arc Wang
7cc196afc3
Merge "2 panes deep link for large screen devices" into sc-v2-dev am: 93e8dff489
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15726372
Change-Id: I6d2342f685326de6e88a9c3d7aa25f7e4fe232f5
2021-09-09 06:58:54 +00:00
TreeHugger Robot
85ec4b7312
Merge "Extends the criteria width of split mode" into sc-v2-dev
2021-09-09 06:48:43 +00:00
Arc Wang
93e8dff489
Merge "2 panes deep link for large screen devices" into sc-v2-dev
2021-09-09 06:45:42 +00:00
Arc Wang
22ce392b91
2 panes deep link for large screen devices
...
This change supports deep link to Settings app internal pages
and external pages outside Settings app.
Apps need android.permission.ALLOW_TWO_PANES_DEEP_LINK_IN_SETTINGS
to send the intent of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
Settings app will startActivity for the intent from
Settings#EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI.
Bug: 197048599
Test: build pass
Change-Id: Idaf4a8be4603c1308f16fb4e378266c1e52acb40
2021-09-09 13:04:31 +08:00
Yanting Yang
83b5a3e01b
Update homepage icon of Safety & emergency
...
Fixes: 197752821
Test: visual
Change-Id: Ib303b66fba556f0779f1c11033bf3c901b98101e
2021-09-09 12:37:07 +08:00
Tsung-Mao Fang
c829a97f13
Extends the criteria width of split mode
...
Follow the ui spec, we extend criteria width from 600dp -> 720dp
Test: Build apk and run on the device.
Fix: 197716926
Change-Id: If963ebb1f51c71a1d225198a150e4cbc2f5ef35a
2021-09-09 12:18:34 +08:00
Bill Yi
77c6ea6e80
Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE
...
Merged-In: I1f20e829bf513d8166458e1749bcc8c9fade07b2
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Change-Id: Icad4036f299d2b082cc617b82f9f900a0f23aa96
2021-09-08 17:57:10 -07:00
Kevin Chyn
f815928cfb
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours am: 5d3df397f2 -s ours am: 0fd589da40 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: I522eb7716c7ff434f4a17f1a7e54be050702bf3f
2021-09-08 21:47:40 +00:00
Kevin Chyn
9c9aa0b19c
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 am: f6f13b578e -s ours am: 937224a479 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Idbc5488171c11e9e6ffc64e4e17670e13b27a3d0
2021-09-08 21:47:23 +00:00
Kevin Chyn
ffcb59556e
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893 am: 1b1c7ee277 -s ours am: c6f265a561 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Iddf85c86d89757b3af4a6cbd55395c5a66447a7c
2021-09-08 21:46:49 +00:00
TreeHugger Robot
fbad5ee8fb
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: 097ab944d3 am: f67025ae4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814
Change-Id: I433e1f7b5aff2a774d66f401224bf627c4f897f3
2021-09-08 21:44:31 +00:00
TreeHugger Robot
9959e43d2b
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: a5cc9839c2 am: 28a172a408
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814
Change-Id: I64e9e8f2e80a5f90eda6572b48d38648f6d7675c
2021-09-08 21:43:05 +00:00
Kevin Chyn
cfe5802ba9
Update udfps lottie edu am: 2405b24311 am: df6ced6647
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783457
Change-Id: Ifca250ed2d783c37f63eb6e188e9175c2554732f
2021-09-08 21:35:41 +00:00
Bill Yi
92d013f268
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 5a00ccefd2 am: b87b6e663f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I5e3bc48cee42ee88eca211a9f8109d94f44fcdcb
2021-09-08 21:34:02 +00:00
Presubmit Automerger Backend
3c304bad9f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: 0347f953a9 -s ours am: b17c1794f9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I2a33837abd7fb582e4b0f26f52208c79722912af
2021-09-08 21:33:53 +00:00
Automerger Merge Worker
9fb0a860c5
Merge "Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: fe74266ba4" into sc-v2-dev-plus-aosp am: 0a42e77619
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579
Change-Id: I662b89f689aeffe66ffa7e5dde089944c0c4fe7d
2021-09-08 21:19:40 +00:00
Presubmit Automerger Backend
34a6effdd3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 77e02cbb71 -s ours am: 948aadcfa4 -s ours am: b39af5a229 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: Ia4576b59f41f562e99273e3a3cb3e937d141248c
2021-09-08 21:19:01 +00:00
Bill Yi
0060d54624
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 7fc6f84bb9 am: 09685239f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I204035efe425b2a67778f6408cfd3ce85e7660cd
2021-09-08 21:18:39 +00:00
Presubmit Automerger Backend
eac18f48c3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: d83a1eb34f -s ours am: 9d308f8931 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I8ca87fb789b1748f89d1c031a43a76aca24c81b1
2021-09-08 21:18:14 +00:00
SongFerng Wang
168a1be452
Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78 am: 12a16eb32d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579
Change-Id: I79bb6ec5faecadd5bc17751e6979207398c2a300
2021-09-08 21:17:49 +00:00
pingzhi wang
860216208f
Remove the option of resetting Euicc data.
...
Euicc reset option should not be available on devices that do not
support embedded sim cards.
Test: make SettingsUnitTests
Test: Build device without FEATURE_TELEPHONY_EUICC and check in Settings/System/Reset options
Bug: 197280361
Change-Id: I24cc65fbe0f8e3c4f1cf792a7b8c5dbfc49d469b
2021-09-08 17:34:30 +02:00
Kevin Chyn
0fd589da40
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours am: 5d3df397f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: I3186236f132e13534f3d34123ba2abda88249cf0
2021-09-08 09:05:19 +00:00
Kevin Chyn
937224a479
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 am: f6f13b578e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ibf4f63e8db97424652ee3e183e8b260cf0a83ced
2021-09-08 09:05:06 +00:00
Kevin Chyn
c6f265a561
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893 am: 1b1c7ee277 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: I5e489e29fa9d9f8f1f9adb2fe36cacb8061e4356
2021-09-08 09:04:48 +00:00
Kevin Chyn
f6f13b578e
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ibcdd4ad0a07289379c7a468ecc339422481389e1
2021-09-08 08:51:44 +00:00
Kevin Chyn
5d3df397f2
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ibb287b60bff61521ee894e6e8099aa7561c574f9
2021-09-08 08:51:40 +00:00
Kevin Chyn
1b1c7ee277
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Icb0714151e308048598738e9a61607dc5361f6fe
2021-09-08 08:51:24 +00:00
Kevin Chyn
066c3183e8
[automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 6db48b9508 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Icfb6fa4502c042c70c00f0895cd6cd6d341b0d1c
2021-09-08 08:50:54 +00:00
Kevin Chyn
cd2016c7a0
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ief10091c6a8fed52e87ea0da33bf24c0bad34ce8
2021-09-08 08:26:47 +00:00
Kevin Chyn
6db48b9508
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: I6f61d1c1f7a56e8310665b3bd7e96bd16ce41ef2
2021-09-08 08:25:57 +00:00
Kevin Chyn
49bbd5b893
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ie1964e499bc6a11499590de5a69f75539939ce3a
2021-09-08 08:25:40 +00:00
TreeHugger Robot
f67025ae4f
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: 097ab944d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814
Change-Id: Ida29e4669e0abe3099e6bd0c1e478961f60808fc
2021-09-08 08:22:28 +00:00
TreeHugger Robot
28a172a408
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: a5cc9839c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814
Change-Id: I9312787c2fcdda1353e7e85b6ead85e86db3e80a
2021-09-08 08:22:04 +00:00
TreeHugger Robot
097ab944d3
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814
Change-Id: Ib14609c4e8f875d1921638194461102dcdc6ede8
2021-09-08 08:09:04 +00:00
TreeHugger Robot
a5cc9839c2
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814
Change-Id: Ibb65b7999bdc331c4b15363bce71ece51a448c0e
2021-09-08 08:09:04 +00:00
TreeHugger Robot
b370bfe77d
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev
2021-09-08 07:57:33 +00:00
Kevin Chyn
0b40e09ba6
[DO NOT MERGE] Update enrollment edu asset
...
Bug: 198858684
Test: Build, enroll
Change-Id: I71dc7b20cd1e2f1805af3214e161feb1f2267ab6
Merged-In: Ic6e589ce738c8b1b82f892452518e4540a73f94b
2021-09-08 00:09:13 -07:00
Kevin Chyn
df6ced6647
Update udfps lottie edu am: 2405b24311
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783457
Change-Id: I11688df2a12ac607aa9787dec8ee1900c33f56c5
2021-09-08 07:03:16 +00:00
Kevin Chyn
2405b24311
Update udfps lottie edu
...
Bug: 198858684
Test: Presubmit
Change-Id: Ic6e589ce738c8b1b82f892452518e4540a73f94b
2021-09-07 22:42:12 -07:00
Wesley.CW Wang
0849672890
Enhance battery settings limit charge tip
...
- Add dialog for limit charge tips
- Add action button to make limit charge tips can bypass charge limited
- Fix layout typo
Screenshot: https://screenshot.googleplex.com/5ngtD2sJAKSQZD3.png
Bug: 196315151
Bug: 197769934
Test: make SettingsRoboTests
Change-Id: I0901c56ae93691c984376852da78cde9078caaf0
2021-09-08 04:31:59 +00:00
Bill Yi
b87b6e663f
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 5a00ccefd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I704119bc0e976de8b3c0f985645e01763b3139e3
2021-09-08 04:04:25 +00:00
Presubmit Automerger Backend
b17c1794f9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: 0347f953a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I298aaba89b64fbaf17518738888e88a6c99e98c0
2021-09-08 04:04:24 +00:00
Automerger Merge Worker
0a42e77619
Merge "Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: fe74266ba4" into sc-v2-dev-plus-aosp
2021-09-08 04:03:49 +00:00
Presubmit Automerger Backend
b39af5a229
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 77e02cbb71 -s ours am: 948aadcfa4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I756568307181a8d4ded9cb30515d0754978494d0
2021-09-08 04:03:46 +00:00
SongFerng Wang
603a299462
Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: fe74266ba4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579
Change-Id: I7b67445c6c8212f0bdf8f1c91b380f2059dead98
2021-09-08 04:03:37 +00:00
Bill Yi
09685239f6
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 7fc6f84bb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I256857ab6c0c4454218bab44b152d0f39a18a07a
2021-09-08 04:03:34 +00:00
Presubmit Automerger Backend
9d308f8931
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: d83a1eb34f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I4af3297bca98f900af2df9eaa7a9da7620669022
2021-09-08 04:03:33 +00:00
SongFerng Wang
12a16eb32d
Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579
Change-Id: I558efa552f7c374dc980c85efbd8f1a9bbb3841f
2021-09-08 04:03:02 +00:00
Presubmit Automerger Backend
948aadcfa4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 77e02cbb71 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I9335ae0dbecdbdb71cbbd1955bc57f6dabf9aa7a
2021-09-08 03:59:12 +00:00
Bill Yi
7fc6f84bb9
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I47cbb350d9c0ab717293fca603684fbd1c5b3f03
2021-09-08 03:52:05 +00:00
