PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,350 Commits 1 Branch 0 Tags
86b26abe8aa18e65b555e3e9ab64bae2fe8f3cbc
Commit Graph

97350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
86b26abe8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours am: 9153fc1720 -s ours am: 574609641b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie463ff35f3600d827008769a0829467cdcd74b7e
 2021-10-27 02:28:50 +00:00
TreeHugger Robot
93884174c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 336aa9899c -s ours am: 2361df8e37 -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: I3da21618f39b99dc0c9e819a10ee0db0ac90939e
 2021-10-27 02:28:44 +00:00
TreeHugger Robot
04cb5796dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0317f233ce -s ours am: a1a8716b23 -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: I08ab1395b3046cf80753b33c2f91db4725d0755e
 2021-10-27 02:28:36 +00:00
Bill Yi
574609641b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours am: 9153fc1720 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibff4043394fcf17bfb35e0e67752b5dfe859811e
 2021-10-27 02:17:49 +00:00
Bill Yi
9153fc1720 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd794d4c6533dd6ed2b188d115fd044a512c8068
 2021-10-27 02:10:44 +00:00
TreeHugger Robot
03d409c54a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 177cb824e7 -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: Iaebaef24105cfcfeb800e7d88b70d212c2181d49
 2021-10-27 02:09:36 +00:00
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
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
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
9bd68e3a97 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-27 01:50:49 +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
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
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
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
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
TreeHugger Robot
0dee196181 Merge "Fix the NPE when input a wrong package" into sc-v2-dev am: baa58563bf am: 1568b185a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115939

Change-Id: Ifddb7c09a8f0d3f6868ac60c1a935b586e2a5baa
 2021-10-26 03:57:36 +00:00
TreeHugger Robot
1568b185a5 Merge "Fix the NPE when input a wrong package" into sc-v2-dev am: baa58563bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115939

Change-Id: I6f31dab56fdc71f617dad4a4e0d471093d843aca
 2021-10-26 03:42:47 +00:00
TreeHugger Robot
baa58563bf Merge "Fix the NPE when input a wrong package" into sc-v2-dev 2021-10-26 03:30:59 +00:00
Joshua Mccloskey
f0a55f7c4e Fixed bug causing user to be stuck on face intro 
Test: See below
Fixes: 203375738
Change-Id: I3e59191a8c936c7c7a3d8561e908593dbf9710b5

1. Enrolled a face during SUW
2. Pressed back on fingerprint enroll intro
3. Verified that the next button's text is chnaged to done
4. The done action launches the fingerprint enroll intro flow.

Change-Id: Id5d652257445e40426ade3d396a31ebf936cc348
 2021-10-25 15:08:51 -07:00
Ganesh Olekar
5b44127dc6 Merge "Update toggle string for cam and mic access" into sc-v2-dev am: f24702f643 am: cce029599f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16102463

Change-Id: Ibc16462fbaf1cc37d0f059d1661133637d4e1217
 2021-10-25 17:37:08 +00:00
Ganesh Olekar
cce029599f Merge "Update toggle string for cam and mic access" into sc-v2-dev am: f24702f643 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16102463

Change-Id: I47bf9211925aaa3341f764db54009c58d9a6ffcf
 2021-10-25 17:19:33 +00:00