PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,870 Commits 1 Branch 0 Tags
d77cc961267fd6c816c70ddcd47cf5a7cb85d4f9
Commit Graph

90870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
d77cc96126 [automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours 
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: Ie0cf9b959ab83a2cb9a838cfda6ee74375483a78
 2022-03-08 11:03:49 +00:00
Xin Li
809f99056f [automerger skipped] Merge Android 12L am: 821558107d -s ours 
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: I044bf2318465b13d4b88093402659c46e6575f65
 2022-03-08 10:18:58 +00:00
Xin Li
821558107d Merge Android 12L 
Bug: 222710654
Merged-In: Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f
Change-Id: If95800025d050393cf92c4f20724c973b154a4ac
 2022-03-08 00:19:27 +00:00
Chaohui Wang
64774540f2 Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297

Change-Id: Icd2c470bbbc7144404b513beef5c6785eab8ca86
 2022-03-07 13:06:22 +00:00
Chaohui Wang
18e2057de2 Merge "Fix Other default preferences alignment" am: c73dfdb858 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297

Change-Id: Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f
 2022-03-07 12:41:09 +00:00
Chaohui Wang
c73dfdb858 Merge "Fix Other default preferences alignment" 2022-03-07 12:21:12 +00:00
Chaohui Wang
71f2d6d44c Fix Other default preferences alignment 
Bug: 222333696
Change-Id: Icdcfff728c891b81d3976f3d625aa93b5154198c
Test: Manual on Pixel device
 2022-03-07 09:36:14 +00:00
Xiao Ma
60dfd4e89f Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9 am: 39bc6f906f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411

Change-Id: I87aa662e232eff08faa456b1de2507683684b564
 2022-03-04 08:41:05 +00:00
Xiao Ma
39bc6f906f Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2007411

Change-Id: Ica6d4fa97c90e7af1607b3bcb9ceddc6ff0d9c58
 2022-03-04 08:19:17 +00:00
Xiao Ma
ebebc5e1e9 Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." 2022-03-04 08:00:01 +00:00
Xiao Ma
bb0a8f2523 Remove InterfaceState and Role @IntDef from TetheredSettings. 
@InterfaceState and @Role won't be exposed as module-lib APIs from
EthernetManager after migration, which are not visible for Settings
code, remove them as well.

Bug: 210586283
Test: m Settings
Change-Id: I49f0e8401681e66d6f5853c8eb3205fcef803c25
 2022-03-04 06:09:33 +00:00
Presubmit Automerger Backend
e39120e45c [automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922

Bug: 216442969
Change-Id: I8b98a48ad8d34b965f0d3dadb06247fdb84572bf
 2022-03-03 23:37:07 +00:00
Edgar Wang
cd517a654a Use android.app.AlertDialog in SetupChooseLockGeneric 
androidx.appcompat.app.AlertDialog will cause postiveButton and negativeButton become too close when the texts are longer.

Bug: 216442969
Change-Id: I39e84c1007c817399902034e853b2aeee1343adc
Test: visual verify
 2022-03-03 23:36:55 +00:00
Bill Yi
702e26be61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f28b44ef8df97b7a8378a6406ea002ba6314aa6
 2022-03-03 10:51:36 +00:00
Bill Yi
8f3d7d5a77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie77cff6452d3575640d7a610febe563736e4dd22
 2022-03-03 10:31:28 +00:00
Bill Yi
40e23845e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife884fc14969c0babdd6948edff1781a75e6cfb6
 2022-03-03 10:08:18 +00:00
Bill Yi
a6545359b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47315f07e63678058eab99a25b69e870b20e1786
 2022-03-03 08:40:04 +00:00
Bill Yi
a93e2d89ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0f44230c35fa3d1c41246ef929b3e188cf084c1
 2022-03-03 08:38:53 +00:00
Bill Yi
d6e99b7741 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65d1242ace5c200def66d4e7073859ee2c3958a2
 2022-03-03 08:18:33 +00:00
Bill Yi
ad345144ed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I68916107f4991d2ce5ee11a25c5f69f1e49390a7
 2022-03-02 16:31:58 +00:00
Bill Yi
a9e8ee6e40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id83f405b8b044af0e5fd33278109d7a656b9ecc1
 2022-03-02 16:28:16 +00:00
Bill Yi
2ba7f57217 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If35ec49c403221a9c6079cf4b4e60ffddbfd5f2e
 2022-03-02 16:24:43 +00:00
Tom Hsu
293571f054 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: I874e3e478ce29dda24860a2e007279bf7ca77c47
 2022-03-02 12:19:56 +00:00
Tom Hsu
0e8aed527f Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: I5de3906942beb7efe557e3491468f91f9d67db48
 2022-03-02 11:59:46 +00:00
Tom Hsu
d915b09e21 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." 2022-03-02 11:28:50 +00:00
Colin Cross
f21625fe80 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If16d05bf70b7802cfc0aaf917949b62231147058
 2022-03-02 00:34:33 +00:00
Colin Cross
e23884eed9 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If31ca44328dd6794977bba78e7c07d89e7d1c796
 2022-03-02 00:13:00 +00:00
Colin Cross
9c59242102 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" 2022-03-02 00:01:05 +00:00
Evan Laird
3a46e06c41 [automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb -s ours 
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c is already in history

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

Change-Id: I540666b2e72f0b6d63980e63fe0f39afa2d464bf
 2022-03-01 16:41:05 +00:00
Evan Laird
15a87a86bb Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev 2022-03-01 16:19:47 +00:00
Evan Laird
39c4d8b827 Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
  Add setting for showing the vibrate icon in status bar
 2022-03-01 16:19:47 +00:00
tom hsu
427906c29e [Tetheirng] Show a dialog indicate tethering is unsupported by carrier. 
Bug: 161206517
Test: manual
Change-Id: I45a2e42367850ab6fc901fe508671677d843b793
 2022-03-01 18:10:10 +08:00
Colin Cross
3f67f87efe Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions 
Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY which will show a user
friendly version name for preview releases, and the release version
for final releases.

Bug: 221950960
Test: manual
Change-Id: I3a7e6a3c996d52614b89888afd35da8cff458b43
 2022-02-28 18:03:23 -08:00
TreeHugger Robot
50b53a1c58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours am: b3efaa654e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1f4c1cb5357a491c77bdf93d340d98d59e059b4
 2022-02-24 18:38:40 +00:00
Bill Yi
340aa20e39 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours am: 3d349c1688 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1a4136bce85ad506e47f66f8806f6af86a4918e
 2022-02-24 18:38:38 +00:00
Bill Yi
30a5c5bf0a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours am: 31a5b89eef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bfb833ef6a25a62bdabc4aa251d0a8930bf22e4
 2022-02-24 18:38:22 +00:00
Bill Yi
8bcdd557ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica0ed6810627f1fd0d72ca966f1096285ef2e40e
 2022-02-24 18:37:13 +00:00
TreeHugger Robot
b3efaa654e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8850b59a5b02dd11a1f8ffaeeb8bb2ef0fabca90
 2022-02-24 18:26:27 +00:00
Bill Yi
3d349c1688 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0f31cd384cdea4944f63a73a0ec8793a21b11f9
 2022-02-24 18:26:24 +00:00
Bill Yi
31a5b89eef [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 3913e56dd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id72c779f290a0e76622bc5dda67dca65c5c63998
 2022-02-24 18:26:06 +00:00
TreeHugger Robot
a18ff15076 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-24 18:05:30 +00:00
Xiao Ma
397b3fe978 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: Ifd244bd60e65937c510a5447c9642225be400e3f
 2022-02-24 05:46:28 +00:00
Xiao Ma
b3fedd0633 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: Icc3b8d9fd42ee9712cfc81c74ae886576695ee2a
 2022-02-24 05:22:10 +00:00
Xiao Ma
3340b8e3c3 Merge "Adapt new EthernetManager APIs in Settings." 2022-02-24 04:58:26 +00:00
Xiao Ma
db7d7de3b4 Adapt new EthernetManager APIs in Settings. 
EthernetManager is going to be moved to Connectivity mainline module and
new EthernetManager management APIs have been exposed. This CL adapts
new APIs in the settings in advance, the changes include:

1. use addInterfaceStateListener and removeInterfaceStateListener.
2. rely on the onInterfaceStateChanged callback to receive the Ethernet
   interface state update, to replace the getAvailableInterfaces and
   getConfiguration.
3. after the Ethernet mainline migration completes, Settings cannot
   access the platform resource such as config_ethernet_iface_regex,
   instead, check the availability of Ethernet interface by checking
   if either any of FEATURE_ETHERNET and FEATURE_USB_HOST is supported.

Bug: 210586283
Bug: 218798003
Test: m
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
      tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<modified test cases>
      EthernetTetherPreferenceControllerTest
      AllInOneTetherSettingsTest
Change-Id: I9e10481e1751975772a24db29568aa26bb85cd70
 2022-02-24 01:49:57 +00:00
Presubmit Automerger Backend
0b843be422 [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463

Bug: 220144337
Change-Id: If4e3bf2b07f7d5ce4121866a2d7cd26d91fb4a82
Merged-In: I2d389d71dd9402353b058039464495a1d33ef0e9
 2022-02-23 15:43:46 +00:00
Evan Laird
16148d2c8c Add setting for showing the vibrate icon in status bar 
Test: manual
Bug: 220144337
Change-Id: I2d389d71dd9402353b058039464495a1d33ef0e9
Merged-In: I2d389d71dd9402353b058039464495a1d33ef0e9
 2022-02-23 15:43:37 +00:00
Bill Yi
674c4b2104 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42ba3032ed27dd6cc3328c42b6076c9ab07921f3
 2022-02-23 08:27:55 +00:00
Bill Yi
fc83e2a05a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If758b66584626c3d33a0be4982d4cb5ed55e4687
 2022-02-23 08:24:25 +00:00
Bill Yi
3913e56dd9 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 
Blank merge reason: commit message contains skip directive

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

Change-Id: Idd1873b76e7931f2fc0befd3b34dea0acf7fe1cb
 2022-02-23 08:21:07 +00:00