Commit Graph

97612 Commits

Author SHA1 Message Date
TreeHugger Robot
136d36274b Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-mainline-prod am: c12e03329c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Ia3cfb705508f4922ccd11617fa42e5ec2370a4bf
2021-10-27 02:09:29 +00:00
TreeHugger Robot
eaf904a40f Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-mainline-prod am: 590c50330b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I3e5022dfb1d52a4fd27c48b2c33990d7a6c750f5
2021-10-27 02:09:18 +00:00
TreeHugger Robot
2dd3f87af4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 40c559c397 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124582

Change-Id: I44ad0ab48c6d85f729e80fdba9576bcb8e60608f
2021-10-27 02:09:06 +00:00
TreeHugger Robot
d0240c3795 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 06cca879db -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I0523de0268fb4c2443cfcdd8ed58c4841fa2b3b8
2021-10-27 02:08:50 +00:00
Bill Yi
5e70ebba87 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: 8e49756934 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I084b4d2ac9411ad10a4c267390c8b91379f9eebe
2021-10-27 02:08:46 +00:00
TreeHugger Robot
177cb824e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I6835e27b8e112595e56ada8ed18c3c16efac1f04
2021-10-27 02:08:41 +00:00
TreeHugger Robot
2361df8e37 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 336aa9899c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124706

Change-Id: Ia6b8adc1eddb38be6636fb5c58393fde5610fcdc
2021-10-27 02:08:20 +00:00
TreeHugger Robot
a1a8716b23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0317f233ce -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124573

Change-Id: Ib237d21a8fc7601c10d06069bff40b558b514079
2021-10-27 02:08:10 +00:00
TreeHugger Robot
06cca879db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I414e913bdd299cbff9893077cfbf52e2811cde5f
2021-10-27 02:03:25 +00:00
TreeHugger Robot
778ae33620 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-27 01:50:53 +00:00
TreeHugger Robot
9bd68e3a97 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-27 01:50:49 +00:00
TreeHugger Robot
5416ffde47 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:49 +00:00
TreeHugger Robot
c12e03329c Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:49 +00:00
TreeHugger Robot
bcc005a077 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa 2p: 8342b2281b
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:49 +00:00
TreeHugger Robot
7b45d4a7ac Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:46 +00:00
TreeHugger Robot
590c50330b Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:46 +00:00
TreeHugger Robot
4ed4a61e57 Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 2p: 59316e7c3c
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:46 +00:00
TreeHugger Robot
336aa9899c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-27 01:50:37 +00:00
TreeHugger Robot
0317f233ce Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-27 01:50:35 +00:00
TreeHugger Robot
66e2bf9779 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-27 01:50:01 +00:00
TreeHugger Robot
40c559c397 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-27 01:49:58 +00:00
TreeHugger Robot
057697b58b Merge changes from topic "presubmit-am-d9cabe182284437683d29b61bf86622a"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f146a24a8e
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:49:57 +00:00
TreeHugger Robot
f7b9f74e2d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-27 01:49:53 +00:00
TreeHugger Robot
a8468ad969 Merge changes from topic "presubmit-am-f390665f5dfc486aaa33611a43cdd11f"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0b0b9f7bb8
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:49:40 +00:00
Joshua Mccloskey
7571e874f7 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c am: 23e3603e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: Iea31095d21a01ef5847ae009331251f1e1df10a5
2021-10-26 18:24:43 +00:00
Bill Yi
0e6f17b4fb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic913ba48bfa2a032682246df0175852aa8bee859
2021-10-26 18:11:34 +00:00
Bill Yi
141d4127f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I356d775f02056287568b055d49f755efdf1ef901
2021-10-26 18:07:42 +00:00
Joshua Mccloskey
23e3603e69 Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499

Change-Id: I46e6989e1e50718b09263d2d24c16105276016a9
2021-10-26 18:05:13 +00:00
Bill Yi
e25e24167f [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa 2p: 8342b2281b
Blank merge reason: parent was merged -s ours

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I3fdf5ee83d6357c285b4a8af3ec5146311246f22
2021-10-26 18:04:08 +00:00
Bill Yi
8342b2281b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I6fc5c6f7c2048f6362a05e08917fa492ac0291bd
2021-10-26 18:04:04 +00:00
Bill Yi
8c035094b8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Ia5cac899e699134c9c3dededfec0419871b5f097
2021-10-26 18:04:03 +00:00
Bill Yi
49389665fa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a2e84d9174edd3eaff854cd7197147fa7888baa
2021-10-26 18:03:56 +00:00
Bill Yi
699dd589fb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7dd94cccfc8a5b7ca75aaa39679266ffca30185f
2021-10-26 17:59:44 +00:00
Bill Yi
16c371fe43 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7dcedca7a4057f9765dfe306c3134f8f82c757e0
2021-10-26 17:55:56 +00:00
Bill Yi
9975577fd7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24332f87c03f57644fd6ffb3d1819f184a54a170
2021-10-26 17:54:07 +00:00
Bill Yi
de067542ea [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 2p: 59316e7c3c
Blank merge reason: parent was merged -s ours

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I6873b0f9df9a4f096bfd78fd811eac564537f7fe
2021-10-26 17:52:44 +00:00
Bill Yi
f7af4b6fb0 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I73f1f4c5f9b93372fd9d02f9b193922c751526cc
2021-10-26 17:52:36 +00:00
Bill Yi
8e49756934 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: Ib88fd011aa4e79ac0fbf689dd5c91e249865a767
2021-10-26 17:52:35 +00:00
Bill Yi
59316e7c3c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I573e156f12bcaf26108964ff1e7d51358294d5d3
2021-10-26 17:52:35 +00:00
Bill Yi
a6de7ad6b8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ied645d81839a1c5b98efcdd508a69aeb291a8feb
2021-10-26 17:52:29 +00:00
Bill Yi
969179f6de Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id71f44891b8ab7d8376e08717bee86428c9fb613
2021-10-26 17:50:53 +00:00
Joshua Mccloskey
fd96fe156c Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev 2021-10-26 17:49:36 +00:00
Bill Yi
91ddfef1d1 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0b0b9f7bb8
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16123868

Change-Id: I055fc93128dfa5b6a2fc6d4bf828b926b06f91bd
2021-10-26 17:48:08 +00:00
Bill Yi
0b0b9f7bb8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I18e299323cd6eae6c9ff32ca74245aa0f01c057c
2021-10-26 17:47:57 +00:00
Bill Yi
c2e8c5639a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f146a24a8e
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124582

Change-Id: I7eb86b269d7f91477c11ed75a3b1938eb991e28a
2021-10-26 17:44:17 +00:00
Bill Yi
f146a24a8e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7531c621c02afea245737b17f2890ad1edd7be0c
2021-10-26 17:44:10 +00:00
Jernej Virag
97ea279c45 Add setting to allow configuration of long press home gesture
This allows configuration of long press home gesture on 2-/3-button navigation configurations. It allows the user to enable and disable the invocation of assistant app using said gesture.

Bug: 191888710
Test: Unit tests and on a physical device.
Change-Id: I18cb290058ac5c2a748d40802b942404f548b868
2021-10-26 13:34:02 +00:00
Mill Chen
dc4ec9bfca Update animation for fingerprint edu page
Bug: 197264655
Test: visual verify
1) Navigate to fingerprint unlock and start fingerprint enrolling flow
2) Observe the education page and see if the animation works

Change-Id: Id07ee17fac29f8f49babb137889e50514ec86326
2021-10-26 15:16:50 +08:00
TreeHugger Robot
666d0984d4 Merge "Update the LE audio device into the media device category" 2021-10-26 05:22:07 +00:00
Alice Kuo
fa0aec49e3 Update the LE audio device into the media device category
Bug: 178981521
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdater
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdater

Change-Id: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
2021-10-26 12:12:46 +08:00