PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,296 Commits 1 Branch 0 Tags
9029e0204e56ce4003b94f6a1e7cfa94f9ee612e
Commit Graph

89296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
9029e0204e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: 8e49756934 -s ours am: 5e70ebba87 -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: Ie05ad586b56df2f883f8b1d22d05440b7d41e199
 2021-10-27 02:28:41 +00:00
TreeHugger Robot
4d9b03d408 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours am: 9b325cd54f -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: Id12eca443f44ac31b1a2017c19122883d1fe530a
 2021-10-27 02:18:44 +00:00
TreeHugger Robot
e19e9e08dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours am: 700fe7493b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id66cc4f8b535680a76e586bf091fd5e309c84dcf
 2021-10-27 02:18:39 +00:00
TreeHugger Robot
714f01e724 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47 am: 9f6ae4ff97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Ie6301ded1ea2c787f66a72a5f876c83bee990519
 2021-10-27 02:18:30 +00:00
Bill Yi
3424128189 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours am: 39e322145f -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: Ifdd66f33b7e50367a83b0bd84e20ac2cd482e014
 2021-10-27 02:18:28 +00:00
TreeHugger Robot
888fb7ca36 Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac am: 034ff149d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I4708e2611d93fafd79a6d205b96b6a8fa637afd6
 2021-10-27 02:18:05 +00:00
Bill Yi
3334d7154c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours am: 80ff342b4a -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: I7e57f11e0000be29218170ce3932e558796b3fe5
 2021-10-27 02:18:03 +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
TreeHugger Robot
9b325cd54f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -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: I3d7ff4a2ccb00a5e9f8a8488051f4d464efc986a
 2021-10-27 02:11:09 +00:00
TreeHugger Robot
700fe7493b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2575e86ccc14baf32e0424a3e936d0a1b00cad4d
 2021-10-27 02:11:04 +00:00
TreeHugger Robot
9f6ae4ff97 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I6ee98b123204aa1c83b18409bdb12e1e46f568f4
 2021-10-27 02:11:01 +00:00
Bill Yi
39e322145f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -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: Id35f11c2ecea70a0b98a0479a62e5f10d361f915
 2021-10-27 02:11:00 +00:00
TreeHugger Robot
034ff149d1 Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: Ia522af0c4e271be71c76a52b4b8497311950fcc7
 2021-10-27 02:10:52 +00:00
Bill Yi
80ff342b4a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -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: I548359fef73f55692e18df0a511c932ae0b7e9b1
 2021-10-27 02:10:51 +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
48b79c4f7d [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: If077afe3d023be33c98959da914fff0e3a59b0e5
 2021-10-27 02:10:44 +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
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
778ae33620 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-27 01:50:53 +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
9bd68e3a97 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 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
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
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
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
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
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
a6de7ad6b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied645d81839a1c5b98efcdd508a69aeb291a8feb
 2021-10-26 17:52:29 +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
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
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
Ganesh Olekar
f24702f643 Merge "Update toggle string for cam and mic access" into sc-v2-dev 2021-10-25 17:14:07 +00:00
Sarah Chin
6f405c9c46 Merge "Remove IMS from editabe APNs" into sc-v2-dev am: 4a78032f62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048825

Change-Id: I68b1b77616fcd72d4bd07133c8b7881f8a64ac8c
 2021-10-25 17:07:34 +00:00
Sarah Chin
4a78032f62 Merge "Remove IMS from editabe APNs" into sc-v2-dev 2021-10-25 17:05:10 +00:00
YUKAI HUNG
22a28d3f7e Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev am: 0ed32fca75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115940

Change-Id: I953a2e45433c6f7c563392ab98272261b37f3e9e
 2021-10-25 17:02:36 +00:00
YUKAI HUNG
0ed32fca75 Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev 2021-10-25 16:49:01 +00:00
ykhung
36a57f4720 Fix the ExpandDividerPreference will flash one time in some corner cases 
Bug: 204051529
Test: make SettingsRoboTests
Change-Id: Iaead6d2a596cbbf0281045b40e4b00f23ceb9f09
 2021-10-25 22:22:49 +08:00
TreeHugger Robot
5c422e7ed2 Merge "Fix broken tests" into sc-v2-dev am: c07317f5a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16114300

Change-Id: Ic270be5214f6b795c3345ab88bc895842527f93b
 2021-10-25 12:31:37 +00:00
TreeHugger Robot
c07317f5a1 Merge "Fix broken tests" into sc-v2-dev 2021-10-25 12:15:57 +00:00
Sunny Shao
8b437cd9c3 Fix the NPE when input a wrong package 
- The mAppEntry is null when got a wrong package.

Bug: 201950262
Test: manual test
Change-Id: I582ec61d816e6f6c3332e4a21d86fb37f3a4354b
 2021-10-25 19:38:58 +08:00
Tsung-Mao Fang
1083ca0b90 Fix broken tests 
Test: Run presubmit
Bug: 204031530
Change-Id: If95afeff91b2fb81b18bfdf6005ba785c6dc1525
 2021-10-25 17:22:01 +08:00