Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,680 Commits 1 Branch 0 Tags
ebdfd05c679f1be41efd793eeff5d7bc47d49495
Commit Graph

38503 Commits

Author SHA1 Message Date
Neil Fuller
c90ae857d8 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 am: 4546286779 am: 51f8f5e6ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: If5e9653f8d9cd80f76681e86ab008c17ca560cf1
 2021-09-13 11:45:30 +00:00
Neil Fuller
51f8f5e6ef Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 am: 4546286779 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I5e14da84bf0eb4d1db411b8ada82de2bbe5cfcb0
 2021-09-13 11:38:28 +00:00
Neil Fuller
4546286779 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I93dfc80658af894e720cec0a2c0e0489ee67c53e
 2021-09-13 11:30:54 +00:00
Neil Fuller
d2eca211d4 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I9be5d173953df0a90ee1309feceed35f9240c18c
 2021-09-13 11:17:50 +00:00
Pavel Grafov
36120b8a4c Respect PASSWORD_QUALITY_MANAGED for biometrics 
Bug: 195488124
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=\
    com.android.settings.password.ChooseLockGenericControllerTest
Test: manual with a modified TestDPC
Change-Id: Ifa15877c735bb0f396051af04a4e012a606bf9e1
 2021-09-13 11:50:06 +01:00
ykhung
a168e2e0fc Fix failed tests since presubmit is ignored in ag/15802168 am: 27efa546cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809054

Change-Id: I5b0e17f5862f295da35456f691dfcdc32587bcdc
 2021-09-11 18:13:37 +00:00
ykhung
27efa546cf Fix failed tests since presubmit is ignored in ag/15802168 
Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I91e715a6bfb64419b457812423996365a9464a93
 2021-09-12 00:36:43 +08:00
Yi-Ling Chuang
5fc96844e5 Correct how the injection mechanism starts activities 
Settings Injection used to start activities with
startActivityForResult() and its extension, where there was not result
really being handled. Hence, this CL corrects the way it starts
activities by removing the "ForResult" part.

Fixes: 197704126
Test: robotest and launch Android Auto to see it being launched in
another task.

Change-Id: I259b2555cf62f8966afdf664b337af5f216b3843
 2021-09-11 16:48:37 +08:00
ykhung
e44128f021 Fix the icon flash issue cause from the shared drawable icon am: a3b89868f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15802168

Change-Id: I4b3e87e071a2fec6ace88afe1336be08e77c4075
 2021-09-11 00:13:28 +00:00
ykhung
a3b89868f4 Fix the icon flash issue cause from the shared drawable icon 
different time slot may have the same application entry, we should not make them share the same drawable instance to impact the states, we will use newDrawable() method to create a new one for each application entry

Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I4a321133ba171817fca1ab7ad47b9af8f7450675
 2021-09-10 16:50:43 +00:00
Neil Fuller
b46adff0f4 Swap ownership to mingaleev@ 
BUG=189810551

Change-Id: I6304545540947d6695117753309c80b27cf2669a
 2021-09-10 12:20:39 +00:00
Bonian Chen
4c3f454c92 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" 2021-09-10 09:46:32 +00:00
ykhung
bb535f4bce Move allowed list definition in the battery usage to feature provider am: b62cdecc67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737

Change-Id: I01745bccfb5cf44fbdfeedd1db6ad2b88a0c71a2
 2021-09-10 05:03:32 +00:00
Ting Yu
638f12a6c8 Fix Text of VoLTE setting cannot be updated when SIM state is changed 
Text of setting menu for VoLTE should be changed from "VoLTE" to
"4G Calling" if "show_4g_for_lte_data_icon_bool" is true. However, it
is not changed in the following steps.
1. Turn Use SIM off on Mobile Network Setting and close Mobile Network
   Setting screen.
2. Open Mobile Network Setting screen again and turn Use SIM on.

Root cause is that the carrier config value is loaded only when SIM's
subid is changed. So, remove checking subId so that the carrier config
value is updated.

Additional fix:
Removed checking #isModeMatched in # onStart because "4G calling"
Setting was grayed out. It needs to listen to call state change
regardless of display status of the preference because Preference may
be switched even after the screen is displayed.

Test: manual
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Bug: 196030198
Change-Id: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
Merged-In: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
 2021-09-10 01:17:26 +00:00
Bill Yi
f4e2f69f3a Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" 2021-09-09 21:27:25 +00:00
ykhung
b62cdecc67 Move allowed list definition in the battery usage to feature provider 
Bug: 199367609
Test: make SettingsRoboTests
Change-Id: I321426e6ff1b9586ee493792f1d39aed35ecc34d
Signed-off-by: ykhung <ykhung@google.com>
 2021-09-10 01:29:32 +08:00
TreeHugger Robot
e1740e2faa Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 am: 63a22fd735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: I69864e3efbdb8e191c5f098c004e5bee06f0351c
 2021-09-09 15:57:13 +00:00
TreeHugger Robot
88cd5025e1 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: If2c47f007a67865ad9aaf8040eddc638f46f7964
 2021-09-09 15:40:14 +00:00
TreeHugger Robot
63a22fd735 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: Id85a00a0673b59ae514b56a8f197aaa65ddd32e6
 2021-09-09 15:40:11 +00:00
TreeHugger Robot
daaf1728b4 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev 2021-09-09 15:28:01 +00:00
Wesley.CW Wang
083ace54d5 Enhance battery settings limit charge tip 
- Add dialog for limit charge tips
 - Add action button to make limit charge tips can bypass charge limited
 - Fix layout typo
 Screenshot: https://screenshot.googleplex.com/5ngtD2sJAKSQZD3.png

Bug: 196315151
Bug: 197769934
Test: make SettingsRoboTests
Change-Id: I0901c56ae93691c984376852da78cde9078caaf0
Merged-In: I0901c56ae93691c984376852da78cde9078caaf0
 2021-09-09 22:13:33 +08:00
Treehugger Robot
11c064519b Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765 am: 972166204d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I47be397c2e1ca103e27ac15638725841a9775ade
 2021-09-09 11:10:59 +00:00
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
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
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
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
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
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
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
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
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
TreeHugger Robot
28a172a408 Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: a5cc9839c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

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

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

Change-Id: Ibb65b7999bdc331c4b15363bce71ece51a448c0e
 2021-09-08 08:09:04 +00:00
TreeHugger Robot
b370bfe77d Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev 2021-09-08 07:57:33 +00:00
SongFerng Wang
12a16eb32d Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I558efa552f7c374dc980c85efbd8f1a9bbb3841f
 2021-09-08 04:03:02 +00:00
SongFerng Wang
fe74266ba4 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I176f6a1b4a7d1551c721a5d63bcaabd5666daf82
 2021-09-08 03:51:42 +00:00
SongFerng Wang
5bcabf3a78 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
 2021-09-08 03:51:39 +00:00