Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,963 Commits 1 Branch 0 Tags
95e5ab5b1c2c096bdabacd8a0db03e1ba6bafdea
Commit Graph

79963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
95e5ab5b1c [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: 0d290a85c7 -s ours am: 82d0f7a11b -s ours am: df6133e2b9 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d55b366bb0d2383e5c9730cb731f9fd2c8d54e2
 2021-03-05 05:37:07 +00:00
Weng Su
1c214797f2 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours am: c271a656a7 -s ours am: 2bf462851c -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6231c7fdf1eb91f4bcfde1505291998d5ee8dd7
 2021-03-05 05:36:58 +00:00
tim peng
40abcd2fa9 [automerger skipped] Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d082221652 am: cd4df5a1d3 -s ours am: a79726325b -s ours 
am skip reason: Change-Id Ic37b37bdbe6de6bdbad741985d3a920334240d80 with SHA-1 40d4e47b05 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c6bf103278719e5cef7ac01c7f31f1fb0644164
 2021-03-05 05:36:48 +00:00
TreeHugger Robot
df6133e2b9 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: 0d290a85c7 -s ours am: 82d0f7a11b -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38a19586d3792946dc61a73315a0affe90b2d787
 2021-03-05 05:16:18 +00:00
Weng Su
2bf462851c [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours am: c271a656a7 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieab165588cac75977ce1a4737f401e49ff2af825
 2021-03-05 05:14:39 +00:00
tim peng
a79726325b [automerger skipped] Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d082221652 am: cd4df5a1d3 -s ours 
am skip reason: Change-Id Ic37b37bdbe6de6bdbad741985d3a920334240d80 with SHA-1 40d4e47b05 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fd18d47c37238abec9f5f7c3cddf7645242b6ea
 2021-03-05 05:13:09 +00:00
Tom Hsu
3bc9bcdae2 Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I724225de0d877cf017b289b7a0b9198771b20ba9
 2021-03-05 04:53:46 +00:00
Abel Tesfaye
50e41300a9 Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev am: 61aa289dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13714687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70ce193ba057b981dc39ec1b5165fa1afa5ef416
 2021-03-05 04:53:02 +00:00
TreeHugger Robot
ef509128d5 Merge changes from topic "jr_device" into sc-dev am: dd6255a653 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c3f66711f680ad87fdef74835df607410d2460
 2021-03-05 04:50:43 +00:00
TreeHugger Robot
82d0f7a11b [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: 0d290a85c7 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9490d4938e188774ad9700518fe7e2ec61b6889
 2021-03-05 04:47:22 +00:00
TreeHugger Robot
0d290a85c7 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I052bc73db19c56eff3cfa7dec4453595c4fe29d3
 2021-03-05 04:26:00 +00:00
Weng Su
c271a656a7 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6e308309d136e18ecfe56f17e4379504197676c
 2021-03-05 04:25:55 +00:00
Weng Su
739bf235e5 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie75ab656ae36f2960b84784c48c82ae640e933a6
 2021-03-05 04:25:30 +00:00
tim peng
cd4df5a1d3 Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d082221652 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9a1679a3b154e0aba27a01d1ad42f407e3d58a4
 2021-03-05 04:25:29 +00:00
TreeHugger Robot
7e7779a422 Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev am: 74d540f8f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13755450

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85baaf7368b8f34046e606a451528fd3d3c416df
 2021-03-05 04:25:01 +00:00
Tom Hsu
1db2d1a25b Merge "[Provider Model] Fix preference summary not update." into sc-dev 2021-03-05 03:25:59 +00:00
Jeremy Goldman
576009adeb Merge "StorageProfileFragmentTest converted to JUnit" 2021-03-05 03:24:17 +00:00
Abel Tesfaye
61aa289dac Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev 2021-03-05 02:39:02 +00:00
tim peng
d082221652 Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev 2021-03-05 02:03:05 +00:00
TreeHugger Robot
dd6255a653 Merge changes from topic "jr_device" into sc-dev 
* changes:
  Update NLS listing page
  Add device list to NLS pages
  Add icons to NLS mgmt page
 2021-03-05 01:02:02 +00:00
TreeHugger Robot
e0a922612f Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev 2021-03-04 23:48:51 +00:00
Weng Su
f71502fb10 [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I578a0db27ddf400017d53edadcb13938f398210b
 2021-03-04 23:05:59 +00:00
TreeHugger Robot
74d540f8f0 Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev 2021-03-04 22:46:37 +00:00
Julia Reynolds
ddf1958bdc Update NLS listing page 
- Organized by allowed/not allowed
- Include paired devices if there are any

Test: settings robotests
Fixes: 181125174
Change-Id: Id64ee0ebd9b40a92d54a03d92fec3ff0bb3b926d
 2021-03-04 20:54:10 +00:00
Abel Tesfaye
9481334a6a Instrument metrics for smart-auto-rotate and screen timeout 
Test: locally with flame

Bug: 172974834
Change-Id: Id6927e749049c88e4efea2d69f93b9d397acc1c1
 2021-03-04 20:01:36 +00:00
Yi Jiang
05a310b89b Merge "Adds 'more details' hyper link." into sc-dev am: c08943784c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769106

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da3a8ced8594349dd7e01063b0d2f3cae253883
 2021-03-04 18:58:16 +00:00
Yi Jiang
c08943784c Merge "Adds 'more details' hyper link." into sc-dev 2021-03-04 18:11:11 +00:00
Julia Reynolds
ef6646458b Add device list to NLS pages 
If a notification listener has access via the
companion device manager api, list the name(s) of the
associated devices to give the user more context about
why the app has notification listener access.

Test: settings unit
Bug: 181125174
Change-Id: I01771b2c4e136fe16d23e89f33f85f63803e3f7c
 2021-03-04 15:31:35 +00:00
Julia Reynolds
84d83e2923 Add icons to NLS mgmt page 
Test: manual
Fixes: 181125169
Change-Id: Id8340db5f2901947c4e63e459aad1fee52437a9f
 2021-03-04 15:31:25 +00:00
SongFerng Wang
81a1df8f46 [automerger skipped] Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8 am: 1cb02f5e0d -s ours am: 18a6887811 -s ours 
am skip reason: Change-Id Ia99a4cf4618fcb32162485e7da5e48e3b313ce67 with SHA-1 216b346438 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I586e98d2108fe68391e674e7aed76363c12e2f88
 2021-03-04 15:05:11 +00:00
SongFerngWang
b0face5be4 [automerger skipped] Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 am: 959454f32a -s ours am: 351a28418c -s ours 
am skip reason: Change-Id Ib31e23b81bdbd3b5336b45fc73994f40d021718b with SHA-1 d4a25fd13a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf68efe87084ee34070f6a6d6487d8cdf14cb0d7
 2021-03-04 15:05:08 +00:00
SongFerng Wang
18a6887811 [automerger skipped] Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8 am: 1cb02f5e0d -s ours 
am skip reason: Change-Id Ia99a4cf4618fcb32162485e7da5e48e3b313ce67 with SHA-1 216b346438 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec2ac0ac303394d15d5540c6050ea9ecc989e3ff
 2021-03-04 14:48:19 +00:00
SongFerngWang
351a28418c [automerger skipped] Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 am: 959454f32a -s ours 
am skip reason: Change-Id Ib31e23b81bdbd3b5336b45fc73994f40d021718b with SHA-1 d4a25fd13a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87e7116e1731b417e605330d2ddf5a5f1b594862
 2021-03-04 14:48:16 +00:00
Stanley Wang
664824e532 Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev am: a380b04d7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75a8d4f63453d2b369d7274eb360ce5be35a3ab4
 2021-03-04 14:43:33 +00:00
Stanley Wang
a380b04d7b Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev 2021-03-04 14:12:47 +00:00
SongFerng Wang
1cb02f5e0d Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I298f46dd7e44e63141b91ccdd67ea7ebbefc9015
 2021-03-04 13:45:19 +00:00
SongFerngWang
959454f32a Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de84a9f2ee32569f71fd46fc87a448237147d02
 2021-03-04 13:45:18 +00:00
tom hsu
edaeb41ff7 [Provider Model] Fix preference summary not update. 
- When activity enter onPause, the status will not update, then
 sub id of TelephonyManager keep same value after activity go back.

 - Solution: Everytime update the UI, and always get new
 TelephonyManager with the latest sub id.

Bug: 181196545
Test: atest passed.
Test: Manual test passed.
Change-Id: I1d65bbc06af66b97b6c85f40bed394da03213d06
 2021-03-04 21:26:57 +08:00
SongFerng Wang
d5ff766ed8 Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife74a181399e5c10866b92663f56a2e0077bc9c4
 2021-03-04 13:11:01 +00:00
SongFerngWang
18c15a2545 Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0892ae8b68eff489e2274aad56588d3c918a369e
 2021-03-04 13:10:46 +00:00
Stanley Wang
29693a2fee Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev am: c4d839e3df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c6191294fa54fbebe51dc50e206b1b787e02028
 2021-03-04 13:10:17 +00:00
Calvin Pan
f8fdb4dd27 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev am: 41a7293038 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13656807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3bd1779077a6b41dd08c18be77f5027e4ea4f6e
 2021-03-04 13:09:26 +00:00
Stanley Wang
c4d839e3df Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev 2021-03-04 11:44:38 +00:00
Calvin Pan
41a7293038 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev 2021-03-04 11:33:47 +00:00
SongFerng Wang
191136002b Merge changes Ia99a4cf4,Ib31e23b8 
* changes:
  [Testcase] To migration DisabledSubscriptionControllerTest
  Use SubscriptionManager.getResourcesForSubId to get Resources
 2021-03-04 11:13:08 +00:00
Weng Su
698b4b3ca0 [Provider Model] Ethernet default network with APM enabled on Panel 
- Move the connected Wi-Fi network into Wi-Fi list

- Screenshot:
  https://screenshot.googleplex.com/ALgpHTy8RWUYjSk

Bug: 178926547
Bug: 179106406
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Idd0e0ab52d6fc88633d5b2eddabb00036e077c88
 2021-03-04 18:27:54 +08:00
SongFerngWang
1ffba4af4e [Testcase] To migration DisabledSubscriptionControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment
   to get context
3. Change Copy Right
4. remove the mock of PreferenceScreen

Bug: 173003522
Test: atest DisabledSubscriptionControllerTest.java
Change-Id: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
Merged-In: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
 2021-03-04 09:41:56 +00:00
SongFerngWang
766f78e8ed Use SubscriptionManager.getResourcesForSubId to get Resources 
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.

Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest

Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
 2021-03-04 09:41:31 +00:00
Yi Jiang
bc6ec17120 Adds 'more details' hyper link. 
Adds a 'more details' hyper link in the footer when options are disabled
by admin.

Test: make ROBOTEST_FILTER=ScreenTimeoutSettingsTest RunSettingsRoboTests
Bug: 180314728
Change-Id: I880ccd73f4b2ef0b695619ef42ec87559dc2b65b
 2021-03-04 01:19:50 -08:00
SongFerng Wang
4c0951eaa3 [automerger skipped] Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292 am: a0a079ed11 -s ours am: fea98ca447 -s ours 
am skip reason: Change-Id I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a with SHA-1 e18207b951 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I643700c3941907b92a296ca224fd8af06efabd63
 2021-03-04 09:18:13 +00:00