PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,581 Commits 1 Branch 0 Tags
ae3792c3ee0f2ac1836df88665c97690cec7a37d
Commit Graph

114581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
0b85cdb82b [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours am: c9ea4e256f -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: I4d603b19eb913e26144a1dae0dd4bc78f7438dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:57:34 +00:00
Julia Reynolds
adc9f1de25 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours am: c9ea4e256f -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: If29126847741f7949e3eb5d13c9f6fc53b1674ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:56:30 +00:00
Julia Reynolds
c9ea4e256f [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 91b26eced9 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: I8f0192c2c297baccb05c7788f6652528b5997982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:51:00 +00:00
Julia Reynolds
25a49730f4 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours am: 541f64ddfb -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: Ic674c116e818bdfd09393048a400a766a77f8c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:50:10 +00:00
Julia Reynolds
cc3edfd2c7 Validate config activities with their rule owners am: 65b18b5e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215

Change-Id: I844f7e5eeefced63bca9d9baf7b41d1f9b7ac277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:47 +00:00
Julia Reynolds
541f64ddfb [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: I8c9a0036519c37474da516184f0b1a8503c389bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:13 +00:00
Julia Reynolds
91b26eced9 [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours am: 42e9a0cf0d -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: I0f3113cbd1246e62bf2956551e5e659e49c6de87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:25:35 +00:00
Bob Badour
11411e187b Fix permissions for internal links. 
Test: m droid dist

Change-Id: If872d5e91a78d8f407e618a2c655c8cf4ac7d7fc
 2022-08-10 14:21:47 -07:00
Julia Reynolds
42e9a0cf0d [automerger skipped] Validate config activities with their rule owners am: 59ca26589e -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1 is already in history

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

Change-Id: Ida93487ec0bd4a6bf25b93a1dd990f9d10f23fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:53:46 +00:00
Treehugger Robot
5e49a1ab34 Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb am: f6e91b15da am: 4cfe8b60be am: c00c4b0481 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Iee0132bdf56d518983c91ec9cf6d8d2727f7fe1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 19:37:23 +00:00
Treehugger Robot
c00c4b0481 Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb am: f6e91b15da am: 4cfe8b60be 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: I4882e86eb80eece523b22a0eb1fcccbd922a51e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 19:04:41 +00:00
Treehugger Robot
4cfe8b60be Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb am: f6e91b15da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Idd403862e3246f54819ad23e66ec2dc64ae99024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 18:16:29 +00:00
Treehugger Robot
f6e91b15da Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Iff33f61f11f502870320fe85c93a7012a0a2e286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 18:00:04 +00:00
Treehugger Robot
4967e754eb Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975

Change-Id: Ie48078a7c33f40939b9d49140875ec7a02582ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 17:41:35 +00:00
Julia Reynolds
33710fd9e2 Revert^2 "Improve App notification loading" 
c5f1cb11e0

Change-Id: I5a6d39e0a5f2b7bd30bcc12e207b8bb23857c6d8
 2022-08-10 13:41:22 -04:00
Treehugger Robot
3bd3f983bf Merge "Fix SIM name in Network Details to show the selected SIM." 2022-08-10 16:46:49 +00:00
Julia Reynolds
59ca26589e Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:20:54 +00:00
Julia Reynolds
b161a3b850 Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:20:22 +00:00
Julia Reynolds
65b18b5e69 Validate config activities with their rule owners 
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
 2022-08-10 14:19:14 +00:00
Bruno Kremp
b204960ea4 Fix SIM name in Network Details to show the selected SIM. 
When dual SIM cards with same Carrier Id inserted, authentication of
SIM base network is via default data SIM. However, SIM name shown in
Network Details is always the one inserted first.
Hence, make SIM name of default data SIM shown in Network Details
preferred to keep consistent with the one used for authentication.

Co-authored-by: Yibo Wang <yibo.x.wang@sony.com>

Test: manual test
Bug: 240732444
Change-Id: Ibd64189d6c25b5a64881a0ad9d40854df93481f4
 2022-08-10 15:09:49 +02:00
Jason Hsu
0c35e164ec Merge "Add pair button in bluetooth details page for hearing aid device" 2022-08-10 10:42:35 +00:00
Prabal Singh
b31624d406 Hide work policy info if safety center is enabled 
Fix: b/241747812
Test: Manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=WorkPolicyInfoPreferenceControllerTest

Change-Id: I23d68dd80d91ec9df80dd2542355ecc964583d39
 2022-08-10 09:56:14 +01:00
Arc Wang
ea1580f92b Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow 
Settings$CreateShortcutActivity does not necessary to be
displayed in 2-pane and it seems no scenario needs the flag
Intent.FLAG_ACTIVITY_FORWARD_RESULT.

Bug: 241346847
Test: build pass
Change-Id: I7a8fca61b453db70233b151711df516649424e3a
 2022-08-10 16:14:11 +08:00
Arc Wang
059efbd09f Remove singleTask from Settings homepage 
Launch Settings homepage on a NO ActivityEmbedding supported device:

  Before & after this change, launch Settings homepage will resume
an existing Settings task and finish SubSettings on top of Settings
homepage.

Launch Settings homepage on a ActivityEmbedding supported device:

  Before this change, launch Settings homepage will resume
an existing Settings task and finish SubSettings on top of Settings
homepage and then start SubSettings.

  After this change, launch Settings homepage will resume
an existing Settings task and resume existing SubSettings.

This change improves UX (keep right pane Activity status) and improves
launch performance (it will not finish and start right pane Activity)
for ActivityEmbedding supported devices.

Bug: 240666118
Test: manual
      Launch Settings and observe events log.
Change-Id: I226b852b360e7106e861752d748f644596a0f320
 2022-08-10 08:06:47 +00:00
TreeHugger Robot
2e298b25d0 Merge "Switch Battery Usage Chart from V1 to V2." 2022-08-10 08:01:10 +00:00
jasonwshsu
7880aee855 Add pair button in bluetooth details page for hearing aid device 
Root Cause: Users can not connect another ear again after they cancel
the pairing dialog in Accessibility -> hearing aids entry

Solution: Add pair button in bluetooth details page for hearing aid
device

Bug: 233038449
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest

Change-Id: I6a7af1c2c2263476b040233edb072cc64a2927b0
 2022-08-10 07:20:56 +00:00
Zaiyue Xue
284e049cc1 Switch Battery Usage Chart from V1 to V2. 
Test: manual
Bug: 236101166
Change-Id: I9142c0d4e00dea3771777ba9aedeab07b635fa1a
 2022-08-10 13:55:54 +08:00
Chloris Kuo
26ce9a98f0 Fix settings crash when enhanced notification shown in search results 
init NotificationBackend in constructor and set isSliceable to false in
search result since the NAS enabling logic is required and is in the
parent fragment ConfigureNotificationSettings.

Bug: 237251075
Test: test manually on device
Change-Id: I9082d6eda27784cf378a0d06304b5fc1e2ae6d7f
 2022-08-09 14:12:25 -07:00
Jeff Sharkey
e530a17247 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 am: 8c5c4a7a76 am: 8498c4f3d4 am: ad89dbb4b5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: I0a7d4bee8abaec772415b180d4c35c41bd631a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 19:41:05 +00:00
Jeff Sharkey
ad89dbb4b5 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 am: 8c5c4a7a76 am: 8498c4f3d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: I16e99485d9f6915f443f3789aed558e08dd02ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:59:49 +00:00
Jeff Sharkey
8498c4f3d4 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 am: 8c5c4a7a76 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: I6c2af498637ae8766790bc0d348be8a8173e74dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:42:53 +00:00
Ats Jenk
fe2a168189 Developer tile for toggling desktop mode 
Create a developer tile for toggling desktop windowing mode.
Relies on desktop windowing prototype flag, captions in shell flag and
freeform to be enabled.

Bug: 241944030
Test: manually verified tile is available in developer tiles
Change-Id: I0e5904ac896405ac166590972a83872cdbabb5a4
 2022-08-09 11:19:30 -07:00
Jeff Sharkey
8c5c4a7a76 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f am: 04cdd54030 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: Ieca0de6f73bb0af73988ceb9c5c08af0044c3566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 18:16:02 +00:00
Jeff Sharkey
04cdd54030 Merge "Migrate stringslint.py to AyeAye." am: f37834c09f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867

Change-Id: Ice243d4b3231199f16d9b59a208867c0986b0d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 17:48:33 +00:00
Jeff Sharkey
f37834c09f Merge "Migrate stringslint.py to AyeAye." 2022-08-09 17:29:23 +00:00
TreeHugger Robot
6b806e31f9 Merge "New way to draw battery chart axis labels" 2022-08-09 11:38:17 +00:00
TreeHugger Robot
8ebd4a5f8e Merge "Fix b/241885070: Unexpected texts moving when going back to battery usage page" 2022-08-09 11:12:55 +00:00
TreeHugger Robot
aaaed2f0c1 Merge "Fix b/241872474 Battery usage page will crash when selecting the last hour chart bar, going to app detail page, and going back" 2022-08-09 10:54:16 +00:00
jasonwshsu
b07754d178 Add pair button in bluetooth details page for hearing aid device 
Root Cause: Users can not connect another ear again after they cancel
the pairing dialog in Accessibility -> hearing aids entry

Solution: Add pair button in bluetooth details page for hearing aid
device

Bug: 233038449
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest

Change-Id: I6a7af1c2c2263476b040233edb072cc64a2927b0
 2022-08-09 18:06:27 +08:00
Zaiyue Xue
72b64f2515 New way to draw battery chart axis labels 
Pairly draws axis labels from left and right side to middle. If the pair of labels have any overlap, skips that pair of labels.

https://drive.google.com/drive/folders/1tR4xfJsJGakuH5JRdn74kPD5GBH6u6CL?resourcekey=0-Ikp5CV0DpxllWv7n5-UHnw&usp=sharing

Test: manual
Bug: 236101166
Change-Id: Ib13d4c73b31ad86ac9e318d4315b5a1a0bb25814
 2022-08-09 17:27:11 +08:00
Zaiyue Xue
5316bb71fe Fix b/241885070: Unexpected texts moving when going back to battery usage page 
This bug is because two charts visibility were set to visible everytime
when entering the battery usage page. Only after loading the data and
refresh the UI, one of them could be hidden.

screen record after fix: https://drive.google.com/file/d/1zpynm8UX3XXunlD-WE1eyv6yenrVhAH5/view?usp=sharing&resourcekey=0-y79NYHcm8lgiNRbgy8SEfQ

Test: manual
Bug: 236101166
Bug: 241885070
Change-Id: I9c1dbf79a95dad2c3dece71af6d52f546d8a5808
 2022-08-09 17:08:13 +08:00
Menghan Li
dec32f804c Merge "Fix IllegalStateException to get tile content after device rotate" 2022-08-09 09:01:52 +00:00
Zaiyue Xue
8d0030d874 Fix b/241872474 Battery usage page will crash when selecting the last hour chart bar, going to app detail page, and going back 
This bug is because we always use mHourlyChartIndex to construct
every view model in mHoulyViewModels. However, mHourlyChartIndex could
be got from saved instance. So mHourlyChartIndex may be out of bound in
some hourly view model which has not many hours data.

This fix removes the selectedIndex in BatteryChartViewModel constructor. Suppose the selectedIndex should be set everytime the view model is used.

Test: manual
Bug: 236101166
Bug: 241872474
Change-Id: I0bb5568ac33fcc23c406fe3af308b8d2706c5542
 2022-08-09 16:39:36 +08:00
TreeHugger Robot
7dad6940d4 Merge "Avoid NullPointerException when batteryLevelData is null." 2022-08-09 08:33:41 +00:00
Himanshu Rawat
36a3e977ea [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 6d05b035d1 -s ours am: 245a52c010 -s ours am: cd64f0e384 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I008d39e9d0e48cd1b560f72e19e42cc44ce0ae14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:21 +00:00
Himanshu Rawat
49ab75569b [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 6b7e6b9fcd -s ours am: e8dc99088c -s ours am: 22691cc301 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I7eb8b585c8d60691ced1a730cad51495a50e0d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:19 +00:00
Himanshu Rawat
974689a7fe [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: 58834bca2c -s ours am: b6be4770ac -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I5f3152f03b82c23cdbe8a59dffe9e9175501d646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:10 +00:00
Himanshu Rawat
ebdad23080 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 99d6748582 -s ours am: a06469ea63 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I576d09eb41c8cafcd6a7a63cb8ae29d5b9275dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:09 +00:00
Himanshu Rawat
1aa9df0e60 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: b132484ead -s ours am: 61ca4c719f -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Iad8208643f92845ce6c88c1eee44c9d94eb15cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:11:36 +00:00
Himanshu Rawat
9c62319a93 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 8e5f1b5b74 -s ours am: aed2e13f2f -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Id575da38bb1854bd84af75cc1ce7ebd2b0388de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:11:32 +00:00