PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,708 Commits 1 Branch 0 Tags
454698d97e8c901bacd53bfa5c56f8a93e4547fa
Commit Graph

95708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
972166204d Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I1845ebaf808192d3b28cc72f3548d0f489a4ce7c
 2021-09-09 11:00:58 +00:00
TreeHugger Robot
cd9b8203c2 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b am: 514c49510d am: c0ca45a9b9 am: 8786402d97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I6a2d4a12cd46a1d2a125948feeba81e5d3e7fcfe
 2021-09-09 11:00:34 +00:00
Treehugger Robot
8a57649765 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: Iaf54828eaec9c24a83aaddec90d775dafab6dd34
 2021-09-09 10:46:10 +00:00
TreeHugger Robot
8786402d97 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b am: 514c49510d am: c0ca45a9b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I9547d5bef833318068f212915fba68b93b69538e
 2021-09-09 10:45:48 +00:00
Treehugger Robot
fbf2d0bc55 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I74de819b9c6eefb93d9447efe8398ddd27470933
 2021-09-09 10:28:50 +00:00
TreeHugger Robot
c0ca45a9b9 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b am: 514c49510d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I53a3e0d9353f93f0ca42d6e34decfe77bce63c29
 2021-09-09 10:25:01 +00:00
Treehugger Robot
604c7a7cfa Merge "Remove the option of resetting Euicc data." 2021-09-09 10:09:30 +00:00
TreeHugger Robot
514c49510d Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I6968521de3a4ac2bccc83d934c2c9c897fb10fce
 2021-09-09 10:00:22 +00:00
TreeHugger Robot
818a503116 Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev am: 72cef4f393 am: 47bab41397 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785733

Change-Id: I5c38ac0638a77873b24a09c9c0474c1e0dca06db
 2021-09-09 09:55:22 +00:00
TreeHugger Robot
bb1dd00d0b Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master 2021-09-09 09:47:14 +00:00
TreeHugger Robot
47bab41397 Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev am: 72cef4f393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785733

Change-Id: Ibf734408fb84dc9af71f158264296d56cc286c5c
 2021-09-09 09:40:05 +00:00
TreeHugger Robot
72cef4f393 Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev 2021-09-09 09:28:14 +00:00
Tsung-Mao Fang
bf5a327c5d Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev am: fcfaaff20f am: 692342a1b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785734

Change-Id: Icb8a54cdbfb7736660dd6027811765875fc37e12
 2021-09-09 09:27:18 +00:00
Tsung-Mao Fang
692342a1b1 Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev am: fcfaaff20f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785734

Change-Id: I045d23673cb443694d28dc10575a6710b698be30
 2021-09-09 09:08:42 +00:00
Tsung-Mao Fang
fcfaaff20f Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev 2021-09-09 08:37:10 +00:00
Tsung-Mao Fang
600672c91d Revert "Extends the criteria width of split mode" 
This reverts commit c829a97f13.

Reason for revert: <Observe behavior error after rotating the device>
Bug: 15786013

Change-Id: I58024f143f8c59f8b0cf50d5cd284f84600e36e6
 2021-09-09 08:35:01 +00:00
Bonian Chen
d2eda630e2 [Settings] Avoid from crash - SystemProp default null 
Default system properties should not have "null" as default value.

Bug: 177843016
Change-Id: Idc2b3aaafd1094ba3fbfa859c4ad7a597e1b7a99
Test: build pass
 2021-09-09 08:14:26 +00:00
Yanting Yang
ca9262659f Merge "Update homepage icon of Safety & emergency" into sc-v2-dev am: 5891b736c8 am: 394f005c65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783148

Change-Id: Ie5a1b5c8101b466605ecf1bcecf153fa04478989
 2021-09-09 08:01:30 +00:00
Arc Wang
597784e455 Set 2-pane placeholder for all alias of SettingsHomepageActivity 
SettingsHomepageActivity may be launched by different alias,
this change sets placeholder for all these alias to ensure
placeholder is present.

Bug: 199363383
Test: manual
      1. Click Settings icon button in quick setting panel.
      2. Launch Settings app deep link, then move it to background,
         and the launch Settings app.
Change-Id: I9ba6dbc5cfa2bac51bf53bb21f8983193ba053b6
 2021-09-09 15:59:01 +08:00
Yanting Yang
394f005c65 Merge "Update homepage icon of Safety & emergency" into sc-v2-dev am: 5891b736c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783148

Change-Id: I0303db74aee3e0fc0ea2f80a86a3eb958e331079
 2021-09-09 07:48:28 +00:00
Yanting Yang
5891b736c8 Merge "Update homepage icon of Safety & emergency" into sc-v2-dev 2021-09-09 07:28:38 +00:00
TreeHugger Robot
002ced3e51 Merge "Extends the criteria width of split mode" into sc-v2-dev am: 85ec4b7312 am: 430cf82b46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15786013

Change-Id: I7f49512eb666c1808876d019bf049015ccc74ece
 2021-09-09 07:13:20 +00:00
Arc Wang
97b9e963c9 Merge "2 panes deep link for large screen devices" into sc-v2-dev am: 93e8dff489 am: 7cc196afc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15726372

Change-Id: I8c62ed06fc97af02db8f0ddc6a8d332b51872f38
 2021-09-09 07:13:03 +00:00
TreeHugger Robot
430cf82b46 Merge "Extends the criteria width of split mode" into sc-v2-dev am: 85ec4b7312 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15786013

Change-Id: I3974d05ec14bf783fde05d92901f265f44e14d11
 2021-09-09 06:59:03 +00:00
Arc Wang
7cc196afc3 Merge "2 panes deep link for large screen devices" into sc-v2-dev am: 93e8dff489 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15726372

Change-Id: I6d2342f685326de6e88a9c3d7aa25f7e4fe232f5
 2021-09-09 06:58:54 +00:00
TreeHugger Robot
85ec4b7312 Merge "Extends the criteria width of split mode" into sc-v2-dev 2021-09-09 06:48:43 +00:00
Arc Wang
93e8dff489 Merge "2 panes deep link for large screen devices" into sc-v2-dev 2021-09-09 06:45:42 +00:00
Arc Wang
22ce392b91 2 panes deep link for large screen devices 
This change supports deep link to Settings app internal pages
and external pages outside Settings app.

Apps need android.permission.ALLOW_TWO_PANES_DEEP_LINK_IN_SETTINGS
to send the intent of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
Settings app will startActivity for the intent from
Settings#EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI.

Bug: 197048599
Test: build pass
Change-Id: Idaf4a8be4603c1308f16fb4e378266c1e52acb40
 2021-09-09 13:04:31 +08:00
Yanting Yang
83b5a3e01b Update homepage icon of Safety & emergency 
Fixes: 197752821
Test: visual
Change-Id: Ib303b66fba556f0779f1c11033bf3c901b98101e
 2021-09-09 12:37:07 +08:00
Tsung-Mao Fang
c829a97f13 Extends the criteria width of split mode 
Follow the ui spec, we extend criteria width from 600dp -> 720dp

Test: Build apk and run on the device.
Fix: 197716926
Change-Id: If963ebb1f51c71a1d225198a150e4cbc2f5ef35a
 2021-09-09 12:18:34 +08:00
Bill Yi
77c6ea6e80 Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE 
Merged-In: I1f20e829bf513d8166458e1749bcc8c9fade07b2
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Change-Id: Icad4036f299d2b082cc617b82f9f900a0f23aa96
 2021-09-08 17:57:10 -07:00
Kevin Chyn
f815928cfb [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours am: 5d3df397f2 -s ours am: 0fd589da40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I522eb7716c7ff434f4a17f1a7e54be050702bf3f
 2021-09-08 21:47:40 +00:00
Kevin Chyn
9c9aa0b19c [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 am: f6f13b578e -s ours am: 937224a479 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbc5488171c11e9e6ffc64e4e17670e13b27a3d0
 2021-09-08 21:47:23 +00:00
Kevin Chyn
ffcb59556e [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893 am: 1b1c7ee277 -s ours am: c6f265a561 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddf85c86d89757b3af4a6cbd55395c5a66447a7c
 2021-09-08 21:46:49 +00:00
TreeHugger Robot
fbad5ee8fb Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: 097ab944d3 am: f67025ae4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: I433e1f7b5aff2a774d66f401224bf627c4f897f3
 2021-09-08 21:44:31 +00:00
TreeHugger Robot
9959e43d2b Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: a5cc9839c2 am: 28a172a408 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: I64e9e8f2e80a5f90eda6572b48d38648f6d7675c
 2021-09-08 21:43:05 +00:00
Kevin Chyn
cfe5802ba9 Update udfps lottie edu am: 2405b24311 am: df6ced6647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783457

Change-Id: Ifca250ed2d783c37f63eb6e188e9175c2554732f
 2021-09-08 21:35:41 +00:00
Bill Yi
92d013f268 Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 5a00ccefd2 am: b87b6e663f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238

Change-Id: I5e3bc48cee42ee88eca211a9f8109d94f44fcdcb
 2021-09-08 21:34:02 +00:00
Presubmit Automerger Backend
3c304bad9f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: 0347f953a9 -s ours am: b17c1794f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a33837abd7fb582e4b0f26f52208c79722912af
 2021-09-08 21:33:53 +00:00
Automerger Merge Worker
9fb0a860c5 Merge "Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: fe74266ba4" into sc-v2-dev-plus-aosp am: 0a42e77619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I662b89f689aeffe66ffa7e5dde089944c0c4fe7d
 2021-09-08 21:19:40 +00:00
Presubmit Automerger Backend
34a6effdd3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 77e02cbb71 -s ours am: 948aadcfa4 -s ours am: b39af5a229 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4576b59f41f562e99273e3a3cb3e937d141248c
 2021-09-08 21:19:01 +00:00
Bill Yi
0060d54624 Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 7fc6f84bb9 am: 09685239f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238

Change-Id: I204035efe425b2a67778f6408cfd3ce85e7660cd
 2021-09-08 21:18:39 +00:00
Presubmit Automerger Backend
eac18f48c3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: d83a1eb34f -s ours am: 9d308f8931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ca87fb789b1748f89d1c031a43a76aca24c81b1
 2021-09-08 21:18:14 +00:00
SongFerng Wang
168a1be452 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78 am: 12a16eb32d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I79bb6ec5faecadd5bc17751e6979207398c2a300
 2021-09-08 21:17:49 +00:00
pingzhi wang
860216208f Remove the option of resetting Euicc data. 
Euicc reset option should not be available on devices that do not
support embedded sim cards.

Test: make SettingsUnitTests
Test: Build device without FEATURE_TELEPHONY_EUICC and check in Settings/System/Reset options
Bug: 197280361
Change-Id: I24cc65fbe0f8e3c4f1cf792a7b8c5dbfc49d469b
 2021-09-08 17:34:30 +02:00
Kevin Chyn
0fd589da40 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours am: 5d3df397f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3186236f132e13534f3d34123ba2abda88249cf0
 2021-09-08 09:05:19 +00:00
Kevin Chyn
937224a479 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 am: f6f13b578e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf4f63e8db97424652ee3e183e8b260cf0a83ced
 2021-09-08 09:05:06 +00:00
Kevin Chyn
c6f265a561 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893 am: 1b1c7ee277 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e489e29fa9d9f8f1f9adb2fe36cacb8061e4356
 2021-09-08 09:04:48 +00:00
Kevin Chyn
f6f13b578e [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Ibcdd4ad0a07289379c7a468ecc339422481389e1
 2021-09-08 08:51:44 +00:00
Kevin Chyn
5d3df397f2 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb287b60bff61521ee894e6e8099aa7561c574f9
 2021-09-08 08:51:40 +00:00