TreeHugger Robot
da113335f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 13b64572bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16795303
Change-Id: I92c13f749ba7d43837dfa06804d60c2fec4f063c
2022-02-06 07:29:26 +00:00
Bill Yi
ea2313ee1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794082
Change-Id: I9695f7995505937072075e5df2af755d80d3ce9e
2022-02-06 07:29:16 +00:00
Bill Yi
c5e57f2c00
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e5dcaa4
am: b3e23787a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16795207
Change-Id: Ide5ccd91aa7eec7e3d459830b12b62c0b3515fc3
2022-02-06 07:28:23 +00:00
Bill Yi
9c24b9eb74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e5004e48c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16794073
Change-Id: I6e14a549dc97edd96fec518ab6242a39ce63222d
2022-02-06 07:21:42 +00:00
TreeHugger Robot
13b64572bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-02-06 07:12:26 +00:00
Bill Yi
777dbb327e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie96162d55ef258d966719e932be7a947990a43a7
2022-02-05 08:47:03 +00:00
Bill Yi
e7f361b3cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66e97246a1e7cccda15c563a0001127629a0b684
2022-02-05 08:43:36 +00:00
Bill Yi
b3e23787a4
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e5dcaa4
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16795207
Change-Id: I4e390f12bd6e5fe5ecb62177a66fd252cdd9a9c5
2022-02-05 08:32:57 +00:00
Bill Yi
6a7e5dcaa4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I19ff499a6e3038abc71a90a83c0f3585e66685e9
2022-02-05 08:32:48 +00:00
Bill Yi
2e5004e48c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ae1f5b9196148fdff2b5410dc81c0940fa63427
2022-02-05 08:25:54 +00:00
Kate Montgomery
9082be89bf
Clear recent access list when fragment is paused.
...
When the fragment is resumed, the recent access list will be reloaded.
Clearing the list ahead of time results in a nicer animation and matches
the animtion when the fragment is first open.
Bug: 191503437
Test: manual
Change-Id: I91d01057acc601e6b2a40401f8bd69c5f5aa3579
2022-02-05 01:27:06 +00:00
pingzhi wang
d565d8679f
DO NOT MERGE Fix of crash when error messages are triggered
...
Issue is caused by call FragmentTransaction.commit after
activity saved it's state, then IllegalStateException will be thrown
and Settings will crash.
Bug: 216492911
Test: Manual. First boot up the device and follow the wizard till the
point when register the fingerprint. While adding the fingerprint,
short press the power button and turn off the screen.
Change-Id: I96244fc26d2aa8639538f967d645a6ca4fc7c0ba
Merged-In: I1de23885a9b80fabdc199ad09c35c3f98e86c831
2022-02-04 23:38:47 +00:00
Steven Ng
d74f060971
Merge "Replace hard-coded bedtime action with Settings.ACTION_BEDTIME_SETTINGS"
2022-02-04 14:46:41 +00:00
Dmitri Plotnikov
457715b00d
Remove uses of deprecated class, BatteryStatsHelper
...
Bug: 217618527
Test: rebuild settings. DebugEstimatesLoader is actually unused.
Change-Id: Ic6ebda0d83bf7c8809f0f7cb40903a969c4b469a
2022-02-03 17:32:18 -08:00
Kevin Han
24d67e9a09
Merge "Hook up hibernation eligibility to exemption toggle"
2022-02-03 23:56:04 +00:00
Adam Bookatz
fd3c59aee2
Merge "Fix UserDetailsSettingsTest for mAppCopyingPref"
2022-02-03 22:36:12 +00:00
Xinyi Zhou
93da780888
Merge "Add Fast Pair saved devices settings preference"
2022-02-03 19:51:44 +00:00
Yasin Kilicdere
efede0db18
Merge "Set default name when creating a supervised user in fallback activity."
2022-02-03 19:35:14 +00:00
Remi NGUYEN VAN
0dd1b46fcf
Remove dependencies on hidden network stats APIs
...
Replace usage with equivalent stable APIs.
Bug: 197717846
Test: atest SettingsRoboTests
Change-Id: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
2022-02-03 18:02:17 +09:00
Etienne Ruffieux
55dff92a23
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57
am: 3ddfa01d4d
am: 89b43fde97
am: e89d54c739
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: Iaa5af12751efa061229de1f2d255a48022d08940
2022-02-03 00:57:39 +00:00
Etienne Ruffieux
e89d54c739
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57
am: 3ddfa01d4d
am: 89b43fde97
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: I666780f68471ba1235adc4a2f60e3a50ae5a868c
2022-02-03 00:36:45 +00:00
Etienne Ruffieux
89b43fde97
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57
am: 3ddfa01d4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: I76c8884f7a3dc56403e1b3616eff79baee67cc7f
2022-02-03 00:18:40 +00:00
Etienne Ruffieux
3ddfa01d4d
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: Ie61c0613fd3124401ab0478685bfc189ca107a87
2022-02-03 00:00:40 +00:00
Etienne Ruffieux
7ff6347c57
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()"
2022-02-02 23:41:26 +00:00
Xinyi Zhou
3adae773b6
Add Fast Pair saved devices settings preference
...
Test: Built and flashed on device, verified UI manually.
Bug: 203579197
Change-Id: I8e9563083dd9ed6a8badc6e2536cf94fc635525b
2022-02-02 21:35:53 +00:00
Lucas Silva
3b8ad48c63
Merge "Add oobe dream settings activity"
2022-02-02 19:26:13 +00:00
Jack Yu
4e543a38f6
Do not let guest user disable secure nfc
...
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1
)
2022-02-02 17:44:55 +00:00
Etienne Ruffieux
9692c59d3a
Replacing getActiveDevice by btAdapter.getActiveDevices()
...
BluetoothProfile.getActiveDevice() is hidden, packages
should call BluetoothAdapter.getActiveDevices(profile)
instead.
Tag: #feature
Bug: 200202780
Test: build
Change-Id: Id18658de82a7e8292942951a3832a36465a69da3
2022-02-02 15:29:34 +00:00
Darrell Shi
851b492347
Merge "Settings for timeout to user 0 when docked."
2022-02-02 15:06:38 +00:00
Marie Matheson
ee729ac682
Merge "Adds the SEND_SAFETY_CENTER_UPDATE privileged permission to the Settings app."
2022-02-02 13:59:14 +00:00
Darrell Shi
547416749e
Settings for timeout to user 0 when docked.
...
Test: atest SettingsRoboTests:TimeoutToUserZeroSettingsTest
Test: atest SettingsRoboTests:TimeoutToUserZeroPreferenceControllerTest
Test: manually on device, video: http://shortn/_elZS1CdDtE
Bug: 213906356
Change-Id: I519345cdf44eaf452e092adee78ccf9d79130d33
2022-02-02 06:31:51 +00:00
My Name
2b860e009f
Adding configuration to timeout for "Android is starting message"
...
Low end devices takes longer than 2sec for booting generally. The
timeout keeps the screen blank for 2sec. Adding a configuration so that
we can override it for JioPhone Next.
Bug: 199120420
Test: tested manually on cuttlefish
Change-Id: I58c649e05f0023d4c1ee9d5117d8ca143b2ffa6a
2022-02-02 06:08:10 +00:00
William Escande
bf576a628c
Merge "Use allowed system value"
2022-02-01 23:52:13 +00:00
Lucas Silva
06e373dcb0
Add oobe dream settings activity
...
This activity will be displayed during the deferred setup wizard flow
http://recall/-/eh4NkVnIpkjUSU9uGPTn1S/dxeTM32hyJXN3nDKsRQfrZ
Test: locally on device
Bug: 215651884
Bug: 216195180
Change-Id: I9d8eef411a190cdbfc1a33d1bbbee61338ddd154
2022-02-01 19:10:16 +00:00
Steven Ng
7f0cc14af8
Replace hard-coded bedtime action with Settings.ACTION_BEDTIME_SETTINGS
...
Test: atest SettingsRoboTests:com.android.settings.display.darkmode.*
Bug: 216645903
Change-Id: I3c3a00fa53528056538ab1ae34c011b4b44b3fdf
2022-02-01 16:56:17 +00:00
Joe Bolinger
fa68d9faa9
Merge "Fix crash when error is shown during invalid lifecycle."
2022-01-31 23:26:49 +00:00
Nate Myren
2f1fec89a0
Merge "Create PrivacyControls page in settings"
2022-01-31 22:43:04 +00:00
Jonathan Scott
c3dbc3ffbd
Merge "Allow Device Management Role Holder to update Settings strings."
2022-01-31 19:10:30 +00:00
Yuri Lin
17c47f1447
Merge "Cosmetic changes to zen mode people & sound/vibration screens"
2022-01-31 16:00:50 +00:00
Lucas Silva
7e324bb603
Merge "Implement dream complication settings."
2022-01-31 15:11:03 +00:00
Jack Yu
300e3ada63
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 35b818e4f8
-s ours am: 401178c70f
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Id1024aa29342ac3cc2fca07a263a5a0ed4f1e7e4
2022-01-28 23:48:18 +00:00
Jack Yu
178fd0d65c
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 147f4bc01d
am: 29e46bd01e
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Iee0c4d11b50cacf090a80efe07137582c517e19b
2022-01-28 23:48:10 +00:00
William Escande
8ccfd6da23
Use allowed system value
...
Test: build
Change-Id: I84d87024423869515937ab87381be572fed0ba65
2022-01-29 00:39:02 +01:00
Jack Yu
401178c70f
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 35b818e4f8
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I4174c09fc219ee813fc74264c0e7dbc696eceda1
2022-01-28 23:31:15 +00:00
Jack Yu
29e46bd01e
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
am: 147f4bc01d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ibb578e5efdfffa772c785cb482de853a19faf0b7
2022-01-28 23:29:42 +00:00
Jack Yu
147f4bc01d
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ib69851dd1d88fcba84af0cf940b6f949aab15355
2022-01-28 23:14:00 +00:00
Jack Yu
35b818e4f8
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I552305e84fd81e640b5dc3245826925b0318410d
2022-01-28 23:13:59 +00:00
Jack Yu
84cb11efc6
[automerger skipped] Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 7236467bb5
-s ours
...
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 d9e3e6e4b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Iaa871510caf6638c158f627ffba27bd0860b10b2
2022-01-28 23:03:09 +00:00
Jack Yu
05dfb08c80
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I72ccad504b36bd1112660cc180be93c210ae66c4
2022-01-28 22:53:00 +00:00
Joe Bolinger
ea69c42587
Fix crash when error is shown during invalid lifecycle.
...
Fix: 216492911
Test: manual
Change-Id: I1de23885a9b80fabdc199ad09c35c3f98e86c831
2022-01-28 22:52:29 +00:00