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
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
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
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
Presubmit Automerger Backend
585d501aff
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: If065d05e56a573f40969fb780299099a38b548b0
2021-09-07 01:57:06 +00:00
Presubmit Automerger Backend
4dde18fc09
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: Ia1cb0bebbab85af8bda052e0c430527909949562
2021-09-07 01:57:04 +00:00
Curtis Belmonte
e7849fb0dc
RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment
...
Adds support for showing multiple stages during UDFPS enrollment:
1. Initial touch & center enroll
2. Guided enroll (or continued center enroll for a11y)
3. Fingertip enroll
4. Edge enroll
Test: Manual
Bug: 198858684
Change-Id: I6646db9038d236eca6d6d62e1c7ddf7649e4945e
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
2021-09-06 18:56:38 -07:00
TreeHugger Robot
a366a24b4e
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09ceeb7 am: 903293aa41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15743485
Change-Id: I8558d9e58a9ff86d5ce4df95e551b350fc5a02d6
2021-09-06 09:49:27 +00:00
TreeHugger Robot
903293aa41
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09ceeb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15743485
Change-Id: I3c4676dfeb01743cd4aff1af440f1f819829a138
2021-09-06 08:34:46 +00:00
TreeHugger Robot
2ff09ceeb7
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev
2021-09-06 08:10:21 +00:00
TreeHugger Robot
1a2d1017ec
Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev am: 50020de6f5 am: 6e55a559d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756805
Change-Id: I37f62eb7d9c90adf05508587511bff547813e69c
2021-09-06 04:20:35 +00:00
Betty Chang
3b1c25573b
Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403
Change-Id: Ia6abb73f2bfde7ad4c13ca0bcea28cfe6460968c
2021-09-06 04:16:51 +00:00
Betty Chang
ebdc0e26f6
Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403
Change-Id: I5a889a42d677e064b7ef553405fc0a19996961ad
2021-09-06 04:12:50 +00:00
Betty Chang
edd650f6b5
Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403
Change-Id: Ib0426da2b92a1c5771dffd2ff68618f14f331f44
2021-09-06 04:12:49 +00:00
TreeHugger Robot
6e55a559d4
Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev am: 50020de6f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756805
Change-Id: I985ccc7165c69eb47ed9668fc889a75186d4d8ec
2021-09-06 04:12:23 +00:00
Betty Chang
adc41a55d5
Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev
2021-09-06 04:00:59 +00:00
Sunny Shao
1564ef5ca1
Add more info on the dialog of AllowBindAppWidgetActivity
...
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.
Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
2021-09-06 11:52:51 +08:00
Tsung-Mao Fang
4781fc1687
Revert "Revert "Support two pane design in the Settings app.""
...
This reverts commit 07037dbc3f .
Reason for revert: <Issue already was fixed in ag/15743576 and ag/15743577>
Bug: 197716926
Change-Id: I72b98f8feb513f34e88e735efd578a8e3d9a1963
2021-09-06 02:41:26 +00:00
Ember Rose
2ec042c722
Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev am: 3377f1c04e am: aa472315b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751404
Change-Id: Ic5c1cad46a16d48cf27f88e353cd3afc4b886604
2021-09-03 17:26:32 +00:00
Ember Rose
aa472315b9
Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev am: 3377f1c04e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751404
Change-Id: I449ef55d577a50dfe519275578b2b551bfacbe4e
2021-09-03 17:20:08 +00:00
Tsung-Mao Fang
07037dbc3f
Revert "Support two pane design in the Settings app."
...
This reverts commit a12a0d1eb2 .
Reason for revert: See a build error in git_sc-v2-dev-plus-aosp/aosp_crosshatch-userdebug
Bug: 198722766
Change-Id: Ibf812bf92595f57409e3c6d9cda6a1dfa4a8c72c
2021-09-03 17:12:47 +00:00
changbetty
8dec2efc67
Change the SIM color for passing the GAR
...
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
Merged-In: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-09-03 04:07:31 +00:00
YUKAI HUNG
0051f1e3e9
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878 am: fab65bcfe5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I760b2d0d9a85b271c6a11c0d0255a164d5aba6dc
2021-09-03 02:58:37 +00:00
YUKAI HUNG
0a11568b82
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: Ie57e3be9bda2316a8ee6a59fba76043ed6e61c54
2021-09-03 02:50:11 +00:00
TreeHugger Robot
6ed6c30067
Merge "Support two pane design in the Settings app." into sc-v2-dev am: 9e1b5fb825 am: c2fff38feb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674256
Change-Id: Ica30fd1745fe7d08661493251b11b3fae92d34e7
2021-09-03 02:49:08 +00:00
YUKAI HUNG
fab65bcfe5
Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I39400598833b3de8ae60b6c9901fdbcc6015a16f
2021-09-03 02:48:48 +00:00
TreeHugger Robot
c2fff38feb
Merge "Support two pane design in the Settings app." into sc-v2-dev am: 9e1b5fb825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674256
Change-Id: I185099bd485e55a15e8e67fee0adfa38bf662f8f
2021-09-03 02:37:46 +00:00
YUKAI HUNG
3f1d329878
Merge "Hide Camera background running time in the battery usage screen" into sc-dev
2021-09-03 02:33:22 +00:00
TreeHugger Robot
9e1b5fb825
Merge "Support two pane design in the Settings app." into sc-v2-dev
2021-09-03 02:26:58 +00:00
Tsung-Mao Fang
a12a0d1eb2
Support two pane design in the Settings app.
...
1. Only enable this feature when the flag is on and library is supported
in this device.
2. Add a placeholder rule for home menu.
Network page will be shown to the right pane by default.
3. Add a rule for most sub settings pages.
Known issues:
1. Transition animation seems wrong in this cl.
2. App is closed if user taps back key on the second layer page in fold
state.
Test: Run the apk on large screen device and regular phone. No crash
happens
Bug: 197716926
Change-Id: I089717e84c5e92c6e5b02d9770a24376e250fea2
2021-09-02 13:57:42 +00:00
Treehugger Robot
ce4f483f56
Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90 am: fb1bf5f85e am: e81eb6bd40 am: bc3d304f1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I5db1e2bb4b6e446f1866ea2f252359e588e5c28e
2021-09-02 10:01:09 +00:00
Pasty Chang
fa780e76e5
Merge "Fixed WiFi dialog force closed when physical window size is changed." into sc-v2-dev am: 25ff749e7b am: 6b3c1efab2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15734709
Change-Id: I4c176ed96a2ef7db5e07ec231ad42f500cdab179
2021-09-02 10:00:34 +00:00
Treehugger Robot
bc3d304f1a
Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90 am: fb1bf5f85e am: e81eb6bd40
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I971b57659f2fe1c2179ed85b2300d60cb2fb9215
2021-09-02 09:51:37 +00:00
Pasty Chang
6b3c1efab2
Merge "Fixed WiFi dialog force closed when physical window size is changed." into sc-v2-dev am: 25ff749e7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15734709
Change-Id: I8f7cc9ada0e7f9e4d060e5b06352dcc2dab52b58
2021-09-02 09:48:36 +00:00
Treehugger Robot
e81eb6bd40
Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90 am: fb1bf5f85e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I11c518f21390017a8aa93e8c201ecc3da752b5c1
2021-09-02 09:38:25 +00:00
Pasty Chang
25ff749e7b
Merge "Fixed WiFi dialog force closed when physical window size is changed." into sc-v2-dev
2021-09-02 09:34:43 +00:00
TreeHugger Robot
f8b6a8297c
Merge "Move legacy hide applications in usage screen list to SettingsGoogle" into sc-v2-dev am: 11d6ba6f57 am: 0d4e7a27e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737567
Change-Id: I0a749bf60f06c8c9aa06ad8bc2a3ae222229d4e3
2021-09-02 09:26:12 +00:00
Treehugger Robot
fb1bf5f85e
Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405
Change-Id: I897892c6f9bf29174775917568a9e83714b74af2
2021-09-02 09:25:52 +00:00