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

97333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
250b7c3ef4 Merge "Remove IMS from editabe APNs" into sc-v2-dev am: 4a78032f62 am: 6f405c9c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048825

Change-Id: I227599288db8f27480d7d331748b7ced5e939576
 2021-10-25 17:13:03 +00:00
YUKAI HUNG
da81c7c7bd Merge "Fix the ExpandDividerPreference will flash one time in some corner cases" into sc-v2-dev am: 0ed32fca75 am: 22a28d3f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115940

Change-Id: I08875c7fdfeb8151194ecc93ff351a19945fb2aa
 2021-10-25 17:12:57 +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
83acf8efac Merge "[Settings] Refactor MobileNetworkUtils" 2021-10-25 12:46:39 +00:00
TreeHugger Robot
bb899b82a5 Merge "Fix broken tests" into sc-v2-dev am: c07317f5a1 am: 5c422e7ed2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16114300

Change-Id: I0d363b97aaee8f4306a7db0013253b74eb2af00a
 2021-10-25 12:42:09 +00: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
TreeHugger Robot
bd311f550e Merge changes from topic "two_pane_state" into sc-v2-dev am: 05896ef5fb am: ac5fa697d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101559

Change-Id: Ic75257f310834f0ac3236487bea1e910f7018f1b
 2021-10-25 09:25:25 +00:00
Tsung-Mao Fang
1083ca0b90 Fix broken tests 
Test: Run presubmit
Bug: 204031530
Change-Id: If95afeff91b2fb81b18bfdf6005ba785c6dc1525
 2021-10-25 17:22:01 +08:00
TreeHugger Robot
ac5fa697d2 Merge changes from topic "two_pane_state" into sc-v2-dev am: 05896ef5fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101559

Change-Id: I5f42aebba8811cc3d1711f709e71c3d82c529443
 2021-10-25 09:09:43 +00:00
TreeHugger Robot
05896ef5fb Merge changes from topic "two_pane_state" into sc-v2-dev 
* changes:
  Create an interface to access the two pane state
  Update logic to check two pane resolution
 2021-10-25 08:55:27 +00:00