PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,776 Commits 1 Branch 0 Tags
6d66f61bc34ab5a549ec9f5a885c1ac6acc59c05
Commit Graph

88776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
6d66f61bc3 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: 1c6bdf023f -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: I430f79644c193bbb36a8eaa7e294f7efee4fe55c
 2021-10-08 07:49:57 +00:00
Automerger Merge Worker
19e06f74c8 Merge changes from topic "am-b5e91ab227294ed58bbb399b5c08944f" into sc-v2-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours am: f19c1f0ed1 -s ours
  [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: dadde79d59 -s ours
 2021-10-08 07:49:52 +00:00
Weng Su
3693a99a99 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours am: f19c1f0ed1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28e0a3395ea1650b37dde95fb93e019b18d05bb6
 2021-10-08 07:49:50 +00:00
Weng Su
e85d5acafd [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 -s ours am: e579105a14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf558a13fec83e245d4c2e4aa8110b73ddaa52dc
 2021-10-08 07:49:49 +00:00
Weng Su
75856f7721 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: dadde79d59 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ia4ef2d2b8a3e47aba7865ffdba7a2b249e0fd22f
 2021-10-08 07:49:49 +00:00
Weng Su
a76039a3b9 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours am: bcd7792138 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8fba32c421816f72e9167c2903b45cd413eb1ef1
 2021-10-08 07:49:48 +00:00
Weng Su
5b49dc51be [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 -s ours am: ca90ea9e47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf4295eed0e23c31df46fcae83b169f58bbb21d4
 2021-10-08 07:49:46 +00:00
Weng Su
1647570721 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 am: 0cf0a56f4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I604fa782bd283080f8e39eb1c800aa355ac17308
 2021-10-08 07:49:31 +00:00
Weng Su
ce5b58b636 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours am: 90f30c8eba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie878bc96a19d58423e4d1d603f650151fbba9ab7
 2021-10-08 07:49:30 +00:00
Weng Su
59b3a8317b [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 am: 6229244dac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55a79a296301214c068047cf9f5c663864372f82
 2021-10-08 07:49:30 +00:00
Weng Su
1c6bdf023f [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: I20853bdff515a8de7515498c929ab204c3fb8f78
 2021-10-08 07:39:00 +00:00
Weng Su
e579105a14 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06ef5c77f0b7eca0f15b78f83b8fd2db3fb29351
 2021-10-08 07:38:55 +00:00
Weng Su
bcd7792138 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0c535eff0c406c9b5e52e541a9d75b16e703f29
 2021-10-08 07:38:54 +00:00
Weng Su
ca90ea9e47 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffd455b9592dc57114e8bab3d2a5b7a0f7e197a7
 2021-10-08 07:38:53 +00:00
Weng Su
f19c1f0ed1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a93c7bfde703c6aefe7c694b5e743bab0226ff6
 2021-10-08 07:36:48 +00:00
Weng Su
dadde79d59 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic3fc04d5fff6adc00705f085f7180e4190ff6d89
 2021-10-08 07:36:46 +00:00
Weng Su
0cf0a56f4d [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174

Change-Id: I8bef2b924470482194232d1b5ac26b690dea286b
 2021-10-08 07:36:30 +00:00
Weng Su
90f30c8eba [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I5a04f17a12ef5939b0d5bb70c8ae3b5bd3e6e268
 2021-10-08 07:36:29 +00:00
Weng Su
6229244dac [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170

Change-Id: Icc37fd645ae7e6ccf17873021e87ca76fbb0b134
 2021-10-08 07:36:27 +00:00
Weng Su
5c878f37a6 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: I578872acacdb22c11ef08b1ebb33311d05664475
 2021-10-08 07:22:28 +00:00
Weng Su
504af9e6cd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I305b55c515a15900ed007c56cb6f5362b3b09c6e
 2021-10-08 07:22:28 +00:00
Weng Su
973211dba5 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174

Change-Id: Ib42cd4909a5d6265ee2a3181df4c34b0c32a79bb
 2021-10-08 07:22:21 +00:00
Weng Su
77d30c4d0c [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I5d0fa94c0b09106bb65764ffbd4636209f685c35
 2021-10-08 07:22:20 +00:00
Weng Su
1400ff3139 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170

Change-Id: Ie039408dcee182693303390eca26386ff6c546d2
 2021-10-08 07:22:20 +00:00
TreeHugger Robot
d8d7b901b0 Merge "Update to new method of getting display power profile constants" into sc-v2-dev am: d754409050 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15927847

Change-Id: I5e423b8ee6973354089c6a014fc8900d32cce8eb
 2021-10-08 06:21:16 +00:00
TreeHugger Robot
d754409050 Merge "Update to new method of getting display power profile constants" into sc-v2-dev 2021-10-08 02:28:51 +00:00
Bonian Chen
944f4f15c9 Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45 am: c915df88b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432

Change-Id: I85b477ee8c2a17550a1f33ef236d23a34a6dae29
 2021-10-08 00:34:51 +00:00
Bonian Chen
168eb66096 Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45 am: ca721649c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432

Change-Id: I1273ad2a03d6f18e936008e12e26bfe0df7bd50c
 2021-10-08 00:34:36 +00:00
Bonian Chen
c915df88b7 Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432

Change-Id: I295924575236c7101f3784f8c9f102d2f5dc49a5
 2021-10-08 00:01:14 +00:00
Bonian Chen
ca721649c8 Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432

Change-Id: I1b2cd3afdd506f14f0bb7f8f02299fc8b26116d9
 2021-10-08 00:01:10 +00:00
Bonian Chen
78c18a1b45 Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev 2021-10-07 23:42:43 +00:00
Arc Wang
4b24df9387 Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev am: d2cb885c32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15948302

Change-Id: Ie12e2314024d3eabf1ec2cc69e8565bfc64ca752
 2021-10-07 10:38:43 +00:00
Arc Wang
d2cb885c32 Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev 2021-10-07 10:25:37 +00:00
Arc Wang
dcc46cf136 [Large screen] Fix SplitPaitRule not match for deep link problem 
- Set both secondary ComponentName and secondary Intent action
  in SplitPairFilter when registering SplitPairRule for deep link.

- Set ComponentName to the Intent which DeepLinkHomepageActivity
  uses to start the deep link page.

This change setup Intent and SplitPairRule to have both
Intent action and ComponentName. It fixes matching problem.

Bug: 201627196
Bug: 199888089
Test: manual
      [Unfolded] Long press home (workspace) -> Pop-up menu ->
      Tap 'Wallpaper & style' -> Launch Settings in the left as
      list and 'Wallpaper & style' in the right as detail.
Change-Id: I8cc8cef911ce0d7d05f332eb86f77f8d2543827f
 2021-10-07 17:44:24 +08:00
TreeHugger Robot
1aaa69b8d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours am: d3de9d4b6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic78d95827b2ddcc7fd3ec0b011b0a1372dfa4067
 2021-10-07 09:03:42 +00:00
TreeHugger Robot
07a0e2eaed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours am: 69c9e424e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f6a9e1755783edad3d256903e87e384331c5846
 2021-10-07 08:52:14 +00:00
TreeHugger Robot
d3de9d4b6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad798b30be36844d9812501e49da3800115db0c9
 2021-10-07 08:52:12 +00:00
TreeHugger Robot
69c9e424e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8eba6d2c5e57bb52b4a5f35b954fb01e0714161
 2021-10-07 08:51:58 +00:00
TreeHugger Robot
4f27cbc2ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dd3651cc5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I355bb467c90371c1259f6bafb1df089aa387769b
 2021-10-07 08:51:18 +00:00
TreeHugger Robot
dd3651cc5e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-07 08:40:55 +00:00
TreeHugger Robot
57e7d9c4b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-07 08:40:47 +00:00
Bill Yi
c18019db27 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb42ad66d7b7212c8f9c131f939a08b674f3c640
 2021-10-07 02:41:09 +00:00
Bill Yi
98f9ed5934 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
 2021-10-07 02:37:16 +00:00
Chen Chen
25ab32bab1 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 am: 4f2a6225c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345

Change-Id: I68c7e50dbc5adb8e67026ebedb94741b40e7779c
 2021-10-07 00:57:44 +00:00
Chen Chen
25678e730b BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 am: 579e48b03d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345

Change-Id: Ic8e88d314d355a5e324057a630a2806918f2541d
 2021-10-07 00:57:02 +00:00
Chen Chen
579e48b03d BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345

Change-Id: I25d658e8c82a1e45a69fdd3467309e897e10e8d5
 2021-10-07 00:44:35 +00:00
Chen Chen
4f2a6225c9 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345

Change-Id: Iad645cc93ddf67fa9cd96b2813f0a4a10f48b007
 2021-10-07 00:44:33 +00:00
TreeHugger Robot
4664d0efac Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev am: 7d4dd26362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995346

Change-Id: I3933dda90e3831133d217bcda65c65ea0dc2fd72
 2021-10-06 22:58:42 +00:00
TreeHugger Robot
7d4dd26362 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev 2021-10-06 22:45:23 +00:00
Weng Su
f06e103985 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 am: 18895edd6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76878029325ca87d044bd5544f069fb25eb9cd5a
 2021-10-06 19:20:47 +00:00