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

97552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
c3531fb273 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours am: 00e38c59cc -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: I3b3b4fdc30ed2db92f19c0b452fa1cef53d3e841
 2021-10-08 07:22:34 +00:00
Weng Su
658383d2e3 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -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: Ie3889e39febe5e07f927e5740b48fc0f30a836db
 2021-10-08 07:22:33 +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
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
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
d2a4b6c7e8 Merge "Update to new method of getting display power profile constants" into sc-v2-dev am: d754409050 am: d8d7b901b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15927847

Change-Id: Iae7473f3c59b46ea22a71f23a1d480a013fbe097
 2021-10-08 06:22:12 +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
Jason Chiu
9037ceabd3 Support highlightable Settings homepage menu for 2-pane 
1. Add a preference group adapter to perform highlighting
2. Add a class for mapping highlighable menu keys and preference keys
3. Add an API to determine if the screen is in split mode

Bug: 199017944
Test: manual, build
Change-Id: I8e3fe5fb96480a31ee0f3b3afb6ad78999d3d2bc
 2021-10-08 12:52:52 +08: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
Adam Bookatz
97302f6f77 Merge "UM.getUserHandle -> UM.getProcessUserId" 2021-10-08 02:22:28 +00:00
TreeHugger Robot
433f2bca45 Merge "Update the title of Gesture Navigation page title" 2021-10-08 01:58:07 +00:00
Xin Li
b2fadd3b8a [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours 
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history

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

Change-Id: I6aa40f4ae668620b39543f7a147c49b4689dc9f2
 2021-10-08 01:39:33 +00:00
Xin Li
7062f8326d [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours 
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history

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

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

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

Change-Id: I0546bda55d2eae8ad575f53dcdc971e68eb0cf59
 2021-10-08 00:53:42 +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
Xin Li
433825250d Merge "Merge Android 12" 2021-10-07 23:50:04 +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
arangelov
c5346baaa2 Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag 
The flag prevents the DPC screen from showing with the in-app
transition.

Fixes: 198422800
Test: manual
Change-Id: Ie6debb55396eb5ce48a21b1ef52c89612b1c7ffd
 2021-10-07 19:27:38 +01:00
Arc Wang
1f8c5e7437 Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev am: d2cb885c32 am: 4b24df9387 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15948302

Change-Id: I06b6e9e2db7c249cb14a43a390fee7932d942a4d
 2021-10-07 10:53:33 +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
e7674fbf5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours am: d3de9d4b6c -s ours am: 1aaa69b8d3 -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: I932ceaf4fbc88cf3bdd0f4005efb83194dfa5b42
 2021-10-07 09:04:38 +00:00
TreeHugger Robot
e1f107557e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours am: 69c9e424e8 -s ours am: 07a0e2eaed -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: I66c7fd02a0a042ae7b61b65ecb4d1860579e763b
 2021-10-07 09:04:18 +00:00
Automerger Merge Worker
c502ec3093 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dd3651cc5e -s ours am: 4f27cbc2ce -s ours" 2021-10-07 09:03:44 +00: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
a6f47a0c9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dd3651cc5e -s ours am: 4f27cbc2ce -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: Ie5c25d748ecc386fcbb237e5e95622cd419cf686
 2021-10-07 09:03:40 +00:00
TreeHugger Robot
4f0ad970bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 5e295ac04f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28f380c69255db50d15021d713f6e1fef27b1320
 2021-10-07 09:03:37 +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
5e295ac04f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f29a32ab2d4655067d6fd8a37476a5a9bf37760
 2021-10-07 08:50:34 +00:00
TreeHugger Robot
824f21616b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8182f906e121937261ad6ee30c22569d3ef142f1
 2021-10-07 08:50:25 +00:00
TreeHugger Robot
740b64e9de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fbda4d2bef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb7b2b9ab93619c8b73ef9353e3aa84d12b93531
 2021-10-07 08:43:17 +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
6228bd3469 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-07 08:40:50 +00:00
TreeHugger Robot
57e7d9c4b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-07 08:40:47 +00:00
TreeHugger Robot
37c01d4115 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-07 08:31:00 +00:00
TreeHugger Robot
fbda4d2bef Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-07 08:30:54 +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
Bill Yi
e57cfc0865 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaaafbbba20f60a2937e5947b4a90e13fb8a6d3ad
 2021-10-07 02:33:44 +00:00
Bill Yi
95b89fbaf5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9b43879ad20fbc1c9b9342d5449ca65286447b1e
 2021-10-07 02:30:02 +00:00