Commit Graph

39817 Commits

Author SHA1 Message Date
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
cd9b8203c2 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b am: 514c49510d am: c0ca45a9b9 am: 8786402d97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I6a2d4a12cd46a1d2a125948feeba81e5d3e7fcfe
2021-09-09 11:00:34 +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
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
818a503116 Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev am: 72cef4f393 am: 47bab41397
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785733

Change-Id: I5c38ac0638a77873b24a09c9c0474c1e0dca06db
2021-09-09 09:55: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
bf5a327c5d Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev am: fcfaaff20f am: 692342a1b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785734

Change-Id: Icb8a54cdbfb7736660dd6027811765875fc37e12
2021-09-09 09:27:18 +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
Bonian Chen
d2eda630e2 [Settings] Avoid from crash - SystemProp default null
Default system properties should not have "null" as default value.

Bug: 177843016
Change-Id: Idc2b3aaafd1094ba3fbfa859c4ad7a597e1b7a99
Test: build pass
2021-09-09 08:14:26 +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
TreeHugger Robot
002ced3e51 Merge "Extends the criteria width of split mode" into sc-v2-dev am: 85ec4b7312 am: 430cf82b46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15786013

Change-Id: I7f49512eb666c1808876d019bf049015ccc74ece
2021-09-09 07:13:20 +00:00
Arc Wang
97b9e963c9 Merge "2 panes deep link for large screen devices" into sc-v2-dev am: 93e8dff489 am: 7cc196afc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15726372

Change-Id: I8c62ed06fc97af02db8f0ddc6a8d332b51872f38
2021-09-09 07:13:03 +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
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
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
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
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
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
SongFerng Wang
fe74266ba4 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I176f6a1b4a7d1551c721a5d63bcaabd5666daf82
2021-09-08 03:51:42 +00:00
SongFerng Wang
5bcabf3a78 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
2021-09-08 03:51:39 +00:00
SongFerng Wang
9354a7e81c Merge "[VoNR] VoNR settings" into sc-qpr1-dev 2021-09-08 03:38:02 +00:00
Julia Reynolds
e18d228a5b Remove unneeded NEW_TASK am: 717e3f6270 am: 60dd5ef026 am: cea348541f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: I62a8e597284701f0a90a234d8ff591be41b9eb26
2021-09-07 19:25:30 +00:00
Julia Reynolds
cea348541f Remove unneeded NEW_TASK am: 717e3f6270 am: 60dd5ef026
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: Ibcc61f6a53090ec528f1908d511cc8395f7a6db9
2021-09-07 19:03:07 +00:00
Julia Reynolds
60dd5ef026 Remove unneeded NEW_TASK am: 717e3f6270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: I8f1564b6206d52fca34e510d41e772dcce4ed150
2021-09-07 18:51:32 +00:00
Julia Reynolds
8446a7d455 Remove unneeded NEW_TASK am: 717e3f6270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: I7c184dc768503f4b121bf84c2339e531818efcc8
2021-09-07 18:51:27 +00:00
Julia Reynolds
717e3f6270 Remove unneeded NEW_TASK
To improve animations

Test: manual
Fixes: 197609584
Change-Id: I4cfbe7386014ba1fb6808bfeb283955101c7e1a7
2021-09-07 17:08:41 +00:00
TreeHugger Robot
0571ab940a Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9 am: 89a745dd8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811

Change-Id: Ib9173bcda2280a683fda2e163bfc7467923d0bf2
2021-09-07 08:00:49 +00:00
TreeHugger Robot
89a745dd8c Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811

Change-Id: Idd2af151dcb4c0b8bb8f7fd04f8574544590b467
2021-09-07 07:37:54 +00:00
TreeHugger Robot
f8bb8aced9 Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev 2021-09-07 07:27:05 +00:00
Jason Chiu
7426ab7b9f Define menu keys for highlighting the menu entry on 2-pane UI
- Define an attribute for highlightable menu keys
- List the keys for Settings menu entries
- Support parsing the attribute

Bug: 199017944
Test: robotest
Change-Id: I5759bff591c79d498fffb8b2c2b57f2cb66c4421
2021-09-07 06:32:19 +00:00
Presubmit Automerger Backend
d7e50f20fe [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc am: 585d501aff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850

Change-Id: I61d4f0aedc979e9d6d79c8035bf7e441e68c0e7b
2021-09-07 04:46:50 +00:00
SongFerngWang
eaa71ac6de [VoNR] VoNR settings
Allow user to enable or disable voice over NR.

Bug: 191203577
Test: atest
com.android.settings.network.telephony.NrAdvancedCallingPreferenceControllerTest

Change-Id: I9be4716d0cdac5d698c2058be65bfa541495d012
2021-09-07 10:57:34 +08:00
Wilson Wu
395e839b10 Merge "Update settings PrimarySwitchPreference reference" 2021-09-07 02:51:20 +00:00