TreeHugger Robot
e1740e2faa
Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4
am: 63a22fd735
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143
Change-Id: I69864e3efbdb8e191c5f098c004e5bee06f0351c
2021-09-09 15:57:13 +00:00
TreeHugger Robot
63a22fd735
Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143
Change-Id: Id85a00a0673b59ae514b56a8f197aaa65ddd32e6
2021-09-09 15:40:11 +00:00
TreeHugger Robot
daaf1728b4
Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev
2021-09-09 15:28:01 +00:00
Wesley.CW Wang
083ace54d5
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
Merged-In: I0901c56ae93691c984376852da78cde9078caaf0
2021-09-09 22:13:33 +08:00
Treehugger Robot
11c064519b
Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa
am: fbf2d0bc55
am: 8a57649765
am: 972166204d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237
Change-Id: I47be397c2e1ca103e27ac15638725841a9775ade
2021-09-09 11:10:59 +00:00
Treehugger Robot
972166204d
Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa
am: fbf2d0bc55
am: 8a57649765
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237
Change-Id: I1845ebaf808192d3b28cc72f3548d0f489a4ce7c
2021-09-09 11:00:58 +00:00
Treehugger Robot
8a57649765
Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa
am: fbf2d0bc55
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237
Change-Id: Iaf54828eaec9c24a83aaddec90d775dafab6dd34
2021-09-09 10:46:10 +00:00
TreeHugger Robot
8786402d97
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b
am: 514c49510d
am: c0ca45a9b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688
Change-Id: I9547d5bef833318068f212915fba68b93b69538e
2021-09-09 10:45:48 +00:00
Treehugger Robot
fbf2d0bc55
Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237
Change-Id: I74de819b9c6eefb93d9447efe8398ddd27470933
2021-09-09 10:28:50 +00:00
TreeHugger Robot
c0ca45a9b9
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b
am: 514c49510d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688
Change-Id: I53a3e0d9353f93f0ca42d6e34decfe77bce63c29
2021-09-09 10:25:01 +00:00
Treehugger Robot
604c7a7cfa
Merge "Remove the option of resetting Euicc data."
2021-09-09 10:09:30 +00:00
TreeHugger Robot
514c49510d
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688
Change-Id: I6968521de3a4ac2bccc83d934c2c9c897fb10fce
2021-09-09 10:00:22 +00:00
TreeHugger Robot
bb1dd00d0b
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master
2021-09-09 09:47:14 +00:00
TreeHugger Robot
47bab41397
Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev am: 72cef4f393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785733
Change-Id: Ibf734408fb84dc9af71f158264296d56cc286c5c
2021-09-09 09:40:05 +00:00
TreeHugger Robot
72cef4f393
Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev
2021-09-09 09:28:14 +00:00
Tsung-Mao Fang
692342a1b1
Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev am: fcfaaff20f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785734
Change-Id: I045d23673cb443694d28dc10575a6710b698be30
2021-09-09 09:08:42 +00:00
Tsung-Mao Fang
fcfaaff20f
Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev
2021-09-09 08:37:10 +00:00
Tsung-Mao Fang
600672c91d
Revert "Extends the criteria width of split mode"
...
This reverts commit c829a97f13
.
Reason for revert: <Observe behavior error after rotating the device>
Bug: 15786013
Change-Id: I58024f143f8c59f8b0cf50d5cd284f84600e36e6
2021-09-09 08:35:01 +00:00
Arc Wang
597784e455
Set 2-pane placeholder for all alias of SettingsHomepageActivity
...
SettingsHomepageActivity may be launched by different alias,
this change sets placeholder for all these alias to ensure
placeholder is present.
Bug: 199363383
Test: manual
1. Click Settings icon button in quick setting panel.
2. Launch Settings app deep link, then move it to background,
and the launch Settings app.
Change-Id: I9ba6dbc5cfa2bac51bf53bb21f8983193ba053b6
2021-09-09 15:59:01 +08:00
Yanting Yang
394f005c65
Merge "Update homepage icon of Safety & emergency" into sc-v2-dev am: 5891b736c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783148
Change-Id: I0303db74aee3e0fc0ea2f80a86a3eb958e331079
2021-09-09 07:48:28 +00:00
Yanting Yang
5891b736c8
Merge "Update homepage icon of Safety & emergency" into sc-v2-dev
2021-09-09 07:28:38 +00:00
TreeHugger Robot
430cf82b46
Merge "Extends the criteria width of split mode" into sc-v2-dev am: 85ec4b7312
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15786013
Change-Id: I3974d05ec14bf783fde05d92901f265f44e14d11
2021-09-09 06:59:03 +00:00
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
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
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
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
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