PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,987 Commits 1 Branch 0 Tags
3a9f3d72f746a61a3ffb0dcba9fcb45d56657d28
Commit Graph

96987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
3a9f3d72f7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: cac2809d5b -s ours am: cde6bf9031 -s ours am: 62b29dc3f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ff9f413ed79915e1cf8cdcd5c31eca733a339cc
 2021-10-10 06:21:46 +00:00
Bill Yi
14290e819c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: fcdcf5a0a1 -s ours am: f445e1018d -s ours am: 39e7e33489 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica6df79a3f0e641cef2bfa310d173ce462321378
 2021-10-10 06:20:05 +00:00
TreeHugger Robot
d61cf84efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7 -s ours am: 1b8322a812 -s ours am: ccb2ded802 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie07fecad673832ea7dd004f580f68833f60b5713
 2021-10-10 06:13:46 +00:00
Bill Yi
baea2eb40d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: cac2809d5b -s ours am: 4f311bebde -s ours am: 16e17ee6c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0742a75b5760b5fa28e7014ad94b7141375cf5b6
 2021-10-10 06:12:01 +00:00
Bill Yi
62b29dc3f9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: cac2809d5b -s ours am: cde6bf9031 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45c7f6b3b4fdafbdadf9e2551b282e895145832d
 2021-10-10 06:10:08 +00:00
TreeHugger Robot
41c66e5129 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6cf476bd44 -s ours am: 7439f9dcfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fe882ec2bdfb7a0f020ccf4b8223bd16a68d5d4
 2021-10-10 06:09:11 +00:00
Bill Yi
39e7e33489 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: fcdcf5a0a1 -s ours am: f445e1018d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f7fbd7cda6172b280a1f28183ab56eec9796f94
 2021-10-10 06:09:00 +00:00
TreeHugger Robot
ccb2ded802 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7 -s ours am: 1b8322a812 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I368c1287c2c271b5e70db30e68c230862d233fcf
 2021-10-10 05:57:37 +00:00
Bill Yi
16e17ee6c9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: cac2809d5b -s ours am: 4f311bebde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibeda7ba6e8538ca5f23907b4849ca42ec32b19af
 2021-10-10 05:56:43 +00:00
TreeHugger Robot
1b8322a812 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c57387dee7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4a369673e7cab2927c9c6f51dbf30674c9fc55b
 2021-10-10 05:55:47 +00:00
TreeHugger Robot
7439f9dcfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6cf476bd44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35909efac7d6a21c025f87b5c36cd8a1adb41e4a
 2021-10-10 05:55:12 +00:00
Bill Yi
cde6bf9031 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: cac2809d5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a4ce422c864b46a3400ed3b8e53109a4bf0c957
 2021-10-10 05:55:05 +00:00
Bill Yi
4f311bebde [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: cac2809d5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8cf88d7a8d77131af720823b7be7b2c0af0d50b1
 2021-10-10 05:54:56 +00:00
TreeHugger Robot
b1f67413c6 Merge changes from topic "presubmit-am-ef4fa9c3d1d1499fa069df1783203b3e" into sc-mainline-prod am: 4f8018281c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16019020

Change-Id: Ia0908596638e8db498cac13fbba0c29b985caa92
 2021-10-10 05:54:00 +00:00
Bill Yi
f445e1018d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 am: fcdcf5a0a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3a3af0cabe768f1309479d54c0d99612940eb98
 2021-10-10 05:53:33 +00:00
TreeHugger Robot
c57387dee7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-10 05:34:09 +00:00
TreeHugger Robot
6cf476bd44 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-10 05:34:04 +00:00
TreeHugger Robot
b4fe22e5b4 Merge changes from topic "presubmit-am-ef4fa9c3d1d1499fa069df1783203b3e" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 2p: 1b957d8449
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-10 05:33:25 +00:00
TreeHugger Robot
4f8018281c Merge changes from topic "presubmit-am-ef4fa9c3d1d1499fa069df1783203b3e" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-10 05:33:25 +00:00
TreeHugger Robot
3765b468ed Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-10 05:32:46 +00:00
Bill Yi
4eedb7fa41 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic5c26e1d4bd75816dbda40b0f818dac5729e04b4
 2021-10-08 20:10:53 +00:00
Bill Yi
9b8ef1b7ae Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If65120e7b71d5ea69ec91f72077de3c4b45b287b
 2021-10-08 20:07:13 +00:00
Bill Yi
bad84c00fc [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 2p: 1b957d8449 
Blank merge reason: parent was merged -s ours

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

Change-Id: Id2558122806425b95629a3bafcdcf932d8845870
 2021-10-08 20:03:42 +00:00
Bill Yi
cac2809d5b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 
Blank merge reason: commit message contains skip directive

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

Change-Id: If7e901e27836f4e297645947d45bac9f08088eff
 2021-10-08 20:03:37 +00:00
Bill Yi
fcdcf5a0a1 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iba6c62591668b487a0d31665e28d1ea37956fb44
 2021-10-08 20:03:37 +00:00
Bill Yi
1b957d8449 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 
Blank merge reason: commit message contains skip directive

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

Change-Id: I183bffe85b9a64ed4a9f164d5c12436f5ccf1a08
 2021-10-08 20:03:37 +00:00
Bill Yi
2c4e278709 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icbd3c3d47b1f4d87866e79697db179d113e14d32
 2021-10-08 20:03:23 +00:00
Bill Yi
f1acf27fe7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8759dec7cfdf8f0efa71fc37040646a8b1565014
 2021-10-08 19:59:14 +00:00
Bill Yi
42ecf9572e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 73ef6abb5d 
Blank merge reason: commit message contains skip directive

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

Change-Id: I8d972ef45cb67ef7dac9b4af7a3c96e2962339fa
 2021-10-08 19:48:31 +00:00
Bill Yi
73ef6abb5d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6c0ca1124fac42bec5db5395dea9b27231e74044
 2021-10-08 19:48:18 +00:00
Antoan Angelov
e17b0850ee Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51 am: c32f18a7c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135

Change-Id: I340c4a735b6eda7409f67dab1bcd8252c04a41b1
 2021-10-08 18:49:16 +00:00
Antoan Angelov
c32f18a7c5 Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135

Change-Id: Iaf3272d30b5c54a89525989e9d91ea0c3429c879
 2021-10-08 18:36:40 +00:00
Antoan Angelov
3bc6b32b51 Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev 2021-10-08 18:23:50 +00:00
Greg Kaiser
d659a5271b Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40 am: 3f638ebad8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469

Change-Id: I8a3deba2be06113f781f399221a8463f5454ceee
 2021-10-08 15:12:13 +00:00
Greg Kaiser
3f638ebad8 Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469

Change-Id: I01497de4d02a9a2868af8f2611eb20b24f61b20f
 2021-10-08 14:56:25 +00:00
Greg Kaiser
1ab7ad3e40 Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev 2021-10-08 14:48:14 +00:00
Greg Kaiser
096c090b80 Revert "Support highlightable Settings homepage menu for 2-pane" 
This reverts commit 9037ceabd3.

Reason for revert: Presumed cause of b/202510128

Change-Id: I0daaab95d9bc57229c0c8c916cbe3ada7aafb6fa
 2021-10-08 14:29:06 +00:00
TreeHugger Robot
03d79d517c Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev am: bf6160280f am: 815abaade4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15921663

Change-Id: I7a2da90a01e8b8a154f8ab3495a193abc3aa0657
 2021-10-08 12:27:06 +00:00
TreeHugger Robot
815abaade4 Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev am: bf6160280f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15921663

Change-Id: I92af54854cc20dc8835a9a650d63b018c68692f0
 2021-10-08 12:07:10 +00:00
TreeHugger Robot
bf6160280f Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev 2021-10-08 11:58:29 +00:00
TreeHugger Robot
657f5465c2 Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev am: 1bc9997032 am: fdb46441a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013678

Change-Id: Ia11c47a85621497f49b8ffb0ffcfee3f078b6419
 2021-10-08 11:51:12 +00:00
TreeHugger Robot
fdb46441a9 Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev am: 1bc9997032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013678

Change-Id: I4882850212e0936f262f883ab82ee22c91f171ce
 2021-10-08 11:31:18 +00:00
TreeHugger Robot
1bc9997032 Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev 2021-10-08 11:11:20 +00:00
Arc Wang
28cdf73cf7 [Large screen] Set alwaysExpand for SearchActivity. 
Set alwaysExpand and SearchActivity will show in full screen.

Bug: 196923591
Test: manual
      Settings -> Search settings
Change-Id: I4174753bce15232342fa69d0845225a95d757782
 2021-10-08 18:14:18 +08:00
Xin Li
987825a49d [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours am: b2fadd3b8a -s ours am: f6ff784305 -s ours am: 3f6535f1f0 -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: I575706371228b2628c1f3514817e23d57da18fa6
 2021-10-08 08:59:57 +00:00
Xin Li
3f6535f1f0 [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours am: b2fadd3b8a -s ours am: f6ff784305 -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: I2fde09fc444eaf6e6dc503d5013ad12c5ffc2494
 2021-10-08 08:29:47 +00:00
Jason Chiu
630cbdc519 Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev am: 9b1f593773 am: de33f1224b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785736

Change-Id: Ic375f9e19b1f6dbc6f70cedaa770c133fb96f652
 2021-10-08 08:12:37 +00:00
TreeHugger Robot
8db122761b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 824f21616b -s ours am: 34ab8e7060 -s ours am: 1ac47f4115 -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: Ieda33fb166394e13b8db50a1d5257a1704edfc7f
 2021-10-08 08:12:31 +00:00
TreeHugger Robot
ea57e3305d Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 445ea21c1e am: 5bf33443db am: 68c6cbf627 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I82467877022e4972e3069dafa52d0dec93c5ce58
 2021-10-08 08:12:26 +00:00
TreeHugger Robot
e4d6a8bb22 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: b13e76c167 am: 618509667e am: 8978184833 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I6680ca5b404de2341434c0c0e3769483c4f811a2
 2021-10-08 08:12:16 +00:00