PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,526 Commits 1 Branch 0 Tags
26bbfaaad2c4ef4183fb42a95b6a9981a1a9f8cc
Commit Graph

104526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
changbetty
26bbfaaad2 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419505

Change-Id: I54bee9cf10ff7bae72f7de92d2361f4b59e81aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:49:17 +00:00
changbetty
cdbbd7bba4 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline 
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk

Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
 2022-11-09 06:39:05 +00:00
Bill Yi
0075b291c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6670bd77942247a7facc0118d145b0eb439d38eb
 2022-11-06 13:54:02 -08:00
Arc Wang
bff1d6c14e Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: Ifb26edc4549aa01324d6a4fe55150f61c35043c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-06 05:25:29 +00:00
Arc Wang
923ba5fcb2 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I766b9fa3ccd6c7d690275292b84efbddb19c651e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-06 04:23:18 +00:00
Arc Wang
dd7d2d766a Remove Intent selector from 2-pane deep link Intent 
To guard against the arbitrary Intent injection through Selector.

Bug: 246300272
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I76fbf3ff7a6611ebb3d07f73845a64efe1771769
Merged-In: I8b3b936de490f09f4be960fdafc6e66a1d858ee2
 2022-11-02 07:38:18 +00:00
TreeHugger Robot
9e3d69188f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-11-02 00:09:27 +00:00
Bill Yi
da6968cf02 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie9a020deba61f589a9a40f22048a1bc8919e283d
 2022-10-27 19:33:26 -07:00
Bill Yi
4f45cf9218 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If039c9bd8234ea577a74b89b488d523e4246f0f4
 2022-10-27 19:30:21 -07:00
Bill Yi
dece402e5a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I814f8120bdf869f96b51ccedf7d1fa737740bb06
 2022-10-20 12:38:38 -07:00
TreeHugger Robot
f59720e026 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-17 16:38:05 +00:00
Bill Yi
46d8824ca9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I933ba841c96f32bb402f5bfe167bf80caf4444e9
 2022-10-15 15:42:38 -07:00
Bill Yi
de36845714 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e826273bdc55424787e63cb755130073006e3d6
 2022-10-15 15:39:55 -07:00
TreeHugger Robot
67c367596d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-11 01:58:52 +00:00
TreeHugger Robot
368a98c747 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-11 01:58:52 +00:00
TreeHugger Robot
27709c9688 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-11 01:58:52 +00:00
TreeHugger Robot
034b71d6e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e8d3a383c97c8e423d5a3139e36257e665535a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 22:59:24 +00:00
Bill Yi
c382e1d9fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25c7e7208c40df3771ca5a25ba70a345423cab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 22:59:18 +00:00
TreeHugger Robot
8b14ddae64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icecafa798adc4d8afa175f84342f55a709f3b765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 22:59:13 +00:00
Bill Yi
1616649029 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I710f9aa475c481d3a23aaf7443967b73bfcf0617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 22:58:58 +00:00
Bill Yi
057922bfa7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I234ce82b4725eee473382f133d50c592cc2931ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 22:58:43 +00:00
TreeHugger Robot
19971433a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-10-10 22:14:13 +00:00
TreeHugger Robot
afe5f1ac18 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-10-10 22:14:13 +00:00
Bill Yi
177fea7707 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I84d0bcacb71f88a68f961d2d1cf83b8df1bdcdaf
 2022-10-09 20:42:21 -07:00
Bill Yi
4ba8745b10 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I95d0d47182909547a30671ac207bc59a5769db98
 2022-10-09 20:34:46 -07:00
Bill Yi
467155435c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I30d81e9920cda4cd5d07a1f07456c37b2ac94da3
 2022-10-09 20:26:30 -07:00
Bill Yi
ad156a0b43 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If889f0eeac5a7cf12f1c796cebe9298cebaebaa3
 2022-10-09 20:24:12 -07:00
Bill Yi
b172ac177f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b93ac2068db2bf0f94ea5158e4715f2360c7138
 2022-10-09 20:23:13 -07:00
Bill Yi
c9a075a1e6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad6adf581dc8d7aa95759ad3b86f307a7e9b8724
 2022-10-09 20:20:20 -07:00
Bill Yi
a050a847bc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-02 06:20:38 +00:00
Bill Yi
42a2389e6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib797a3b4169abb6faea3b5bc868e8e785c51adec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:45:49 +00:00
Bill Yi
e289b0f368 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a1027d900d021590709e82299a9dee0533e380d
 2022-09-29 18:51:56 -07:00
Bill Yi
d1da0de9ee Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9d068e8112bd285385013841c3bd05df2abe4a79
 2022-09-29 18:40:46 -07:00
TreeHugger Robot
6cc1b77003 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I9b490c272aca991383f2a2d65f963ee33ac105b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:55:39 +00:00
Milton Wu
a8431fcaf6 [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3037847e57182ec94131b73c35e7cfe4b0e204a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:55:38 +00:00
TreeHugger Robot
f2f310cdf1 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I26feba1ff77c83e08c57817dd36574b7b7218472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:24:53 +00:00
Milton Wu
34d43eb70f [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0958dfb6feb7edf36142450b8998a079ede6277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:24:49 +00:00
TreeHugger Robot
785e311159 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: Ia4267770be69e08e5e4094a092659b8e1d4625e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:59:28 +00:00
Milton Wu
fcffcdd692 [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d4a93f2029eb1ab012fb421874882a5ad699459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:59:27 +00:00
TreeHugger Robot
526fe84452 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I088200b7e34a0075828ef2cb5251ef1be22839c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:58:28 +00:00
Milton Wu
68aeb6639b [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I6c346ba06234fb12dd71d281432d97711d6c681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:58:26 +00:00
TreeHugger Robot
7429f710f7 Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev 
* changes:
  [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920
  [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
  [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
 2022-09-28 22:37:17 +00:00
TreeHugger Robot
80f5fd3836 Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev 
* changes:
  [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
  [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
 2022-09-28 22:37:17 +00:00
Milton Wu
14ed9ab1c4 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours am: 5561341091 -s ours am: 8da95c29a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I116c387de73cb514b83ba05fdbf47512e331a790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:23:49 +00:00
Milton Wu
8da95c29a9 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours am: 5561341091 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If075061207ed359f26ec3a597792329d77bc537a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:53:17 +00:00
Milton Wu
5561341091 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfaa44c53c3f78950a453879f34d27ff8aa88bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:42:15 +00:00
Milton Wu
529896f004 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours am: ed094b353b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c01bb7bf2c8f825f14529505f9927b61b111178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:42:07 +00:00
TreeHugger Robot
9983c28b67 Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ic8aa190849303e9684657fd67fc93a010e270b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:41:52 +00:00
Milton Wu
4cc7080b4f [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ib9ad45c802a510fbd6bac8bbadbba145a8a985f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:41:50 +00:00
Milton Wu
ed094b353b [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I911ef7db2860485823aa86c8c79e037b3db45389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:39:23 +00:00