ykhung
a3b89868f4
Fix the icon flash issue cause from the shared drawable icon
...
different time slot may have the same application entry, we should not make them share the same drawable instance to impact the states, we will use newDrawable() method to create a new one for each application entry
Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I4a321133ba171817fca1ab7ad47b9af8f7450675
2021-09-10 16:50:43 +00:00
ykhung
b62cdecc67
Move allowed list definition in the battery usage to feature provider
...
Bug: 199367609
Test: make SettingsRoboTests
Change-Id: I321426e6ff1b9586ee493792f1d39aed35ecc34d
Signed-off-by: ykhung <ykhung@google.com >
2021-09-10 01:29:32 +08:00
TreeHugger Robot
88cd5025e1
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: If2c47f007a67865ad9aaf8040eddc638f46f7964
2021-09-09 15:40:14 +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
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
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
5891b736c8
Merge "Update homepage icon of Safety & emergency" into sc-v2-dev
2021-09-09 07:28:38 +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
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
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
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
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
2405b24311
Update udfps lottie edu
...
Bug: 198858684
Test: Presubmit
Change-Id: Ic6e589ce738c8b1b82f892452518e4540a73f94b
2021-09-07 22:42:12 -07:00
Bill Yi
5a00ccefd2
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: Icf02c454bdd87f96cf6cdd17ff03ed1f4df42c9f
2021-09-08 03:51:59 +00:00
Presubmit Automerger Backend
0347f953a9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
am: 5d2b55f56c
-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: I29440d5125a8b387e87bbc7fd6e141c42dabc294
2021-09-08 03:51:58 +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
Bill Yi
47bb70329b
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
Import translations. DO NOT MERGE ANYWHERE
2021-09-08 03:43:33 +00:00
SongFerng Wang
9354a7e81c
Merge "[VoNR] VoNR settings" into sc-qpr1-dev
2021-09-08 03:38:02 +00:00
Presubmit Automerger Backend
5d2b55f56c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I8a830a6f59d79a8c663e61240fe9072d5c07891d
2021-09-07 23:51:49 +00:00
Bill Yi
d770312ec1
Import translations. DO NOT MERGE ANYWHERE
...
BUG:198847997
Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
2021-09-07 23:51:36 +00:00
TreeHugger Robot
c6f7cf99e9
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I1a9d3533c92a0a97dc0e673e67a1f33f4ae3cd6a
2021-09-07 20:42:27 +00:00
TreeHugger Robot
ec9a292393
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev
2021-09-07 20:29:33 +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
Julia Reynolds
520c80d649
Add 'snoozing' to NLS consent dialog
...
Test: manual
Bug: 195031401
Change-Id: I93226e89f033689d9731b6d3efd79bb9fdf628b4
2021-09-07 13:17:49 +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
1f10c50614
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I3056dfca5698187d68c2815c35db4ef31eed3eff
2021-09-07 04:46:51 +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
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
Tsung-Mao Fang
8203737671
Update window extension library
...
New library supports to show the debug info.
Test: adb logcat |grep "SplitRuleResolution"
Fix: 195113219
Change-Id: I042c8c00da7234fce051928e5d9cf5bfc1bd4850
2021-09-06 21:24:36 +08:00
Menghan Li
f6c50fefd0
Merge "Fix color checking error of the repohooks" into sc-v2-dev
2021-09-06 10:55:08 +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
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
adc41a55d5
Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev
2021-09-06 04:00:59 +00:00
TreeHugger Robot
50020de6f5
Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev
2021-09-06 03:57:01 +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
Curtis Belmonte
9e3d13850e
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
am: a9c1fa626b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Change-Id: I5e7cd47b755b7a397e026acfb474d528911d8b39
2021-09-05 03:49:02 +00:00
Curtis Belmonte
a9c1fa626b
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Bug: 198847997
Change-Id: Ib88caa522f11d1be6bc3ef9479cfdefe4eabf10a
2021-09-05 00:11:06 +00:00
Curtis Belmonte
4592bf62a3
Update char limits for new UDFPS enroll strings
...
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.
Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
2021-09-04 17:08:01 -07:00