PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,455 Commits 1 Branch 0 Tags
caf59cbbcfc156598b35eaa63e12b0ddfc2f2b51
Commit Graph

81455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
96f73e20aa Merge "[Provider Model] Move down the Internet unavailable Wi-Fi" into sc-dev 2021-04-13 07:53:47 +00:00
YUKAI HUNG
1871275fbf Merge changes I7771a43b,If613c5cf into sc-dev 
* changes:
  Inserts last 24 hour agrregate data into indexed usage map
  Add a method to calculate battery usage diff results from history
 2021-04-13 06:08:18 +00:00
Hugh Chen
97660dd1f4 Add 50% opacity if detect there is no device image yet 
Screenshot:
https://screenshot.googleplex.com/Ah9DKn85S3AWB4r.png

Bug: 177901821
Test: build pass and manual test
Change-Id: Ia5142cdd1cf105d978043987ad92c5c4e8c79e0c
 2021-04-13 12:05:28 +08:00
ykhung
0d54b75b2c Inserts last 24 hour agrregate data into indexed usage map 
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I7771a43baf74b36a816883dd6b6a91128f827cf4
 2021-04-13 11:59:28 +08:00
Wesley Wang
6f0a0da428 Merge "Reorder battery tips priority" into sc-dev 2021-04-13 03:56:46 +00:00
TreeHugger Robot
8c655662af Merge "Fix nit from ag/13715126" into sc-dev 2021-04-13 03:32:59 +00:00
TreeHugger Robot
d8c11f5236 Merge "Integrate new version of MDC-android release" into sc-dev 2021-04-13 03:14:49 +00:00
TreeHugger Robot
94f4aeed44 Merge "Update manage battery usage page string (1/2)" into sc-dev 2021-04-13 02:31:50 +00:00
TreeHugger Robot
3c8e922357 Merge "Fix the backcolor problem in Display/Font size page" into sc-dev 2021-04-13 02:23:00 +00:00
Weng Su
6884d63824 [Provider Model] Move down the Internet unavailable Wi-Fi 
- Move down the Internet unavailable Wi-Fi to the top of the available
Wi-Fi networks

- Don't paint color for the Internet unavailable Wi-Fi

- Screenshot:
  https://screenshot.googleplex.com/94NotfJLKXSbBW9

Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I1c98e2a8793ce9dc2fb886c0fa66f4297a34ab01
 2021-04-13 10:04:33 +08:00
TreeHugger Robot
086fb08d76 Merge "Update string" into sc-dev 2021-04-13 01:59:35 +00:00
sallyyuen
fbdb01dc87 Add a banner for RBC/Extra Dim 
Screenshot: https://screenshot.googleplex.com/5kumq7ruwCzd6vC.png

Test: Manual
Bug: 170973645
Change-Id: Iea9d90ded5fc393b78e724ec10bc83ff7295965c
 2021-04-13 01:07:26 +00:00
Jay Aliomer
7f0888a6a0 Merge "Notif History Visual Buff" into sc-dev 2021-04-12 20:40:52 +00:00
Jay Aliomer
01af86409d Notif History Visual Buff 
Bug: b/184885964
Test: visual
Change-Id: I390c01bd743ebed020cc8a1a05e8c70d4e9b4eb7
 2021-04-12 20:40:43 +00:00
Dmitri Plotnikov
f2f2fd52a2 Adjust for changing BatteryUsageStats constructor 
Bug: 184207674
Test: make RunSettingsRoboTests
Change-Id: I9f2ec8ff6764100022b0580f4a7d4281062d8755
 2021-04-12 11:24:05 -07:00
Chloris Kuo
ccd2bfc1a0 Merge "NAS Setting Migration" into sc-dev 2021-04-12 17:16:50 +00:00
Janis Danisevskis
cb79648ab1 Fix nit from ag/13715126 
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I3e674387522bbacdbe0df70746b521b059819007
 2021-04-12 09:42:28 -07:00
ykhung
aeb5b95705 Add a method to calculate battery usage diff results from history 
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: If613c5cfd7e00e1883107385d3d8552774378cd7
 2021-04-13 00:25:17 +08:00
TreeHugger Robot
588e4e8d8b Merge "Use ConstraintLayut to improve UI of storage items" into sc-dev 2021-04-12 13:30:30 +00:00
Wesley.CW Wang
e9a0d50e99 Update manage battery usage page string (1/2) 
Bug: 183689347
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Ib24b74c8c38ef28520deed043a4b1841b8a50803
 2021-04-12 12:58:20 +00:00
Jeremy Goldman
4ee56ab90d Merge "Maintain VPN type form the VpnProfile" into sc-dev 2021-04-12 10:10:11 +00:00
Wesley.CW Wang
d081de87b8 Reorder battery tips priority 
- Change the oreder to Battery Low > Defender > High Battery Usage > Adaptive Battery

Bug: 177407113
Test: make SettingsRoboTests
Change-Id: I7000a0aef30bff90c7aedfd5a43b2229529886e9
 2021-04-12 17:58:21 +08:00
TreeHugger Robot
2216765159 Merge "Fix gender issue on subtext of screen pinning" into sc-dev 2021-04-12 09:48:40 +00:00
TreeHugger Robot
e63e2a781c Merge "Fix color lint error" into sc-dev 2021-04-12 09:33:10 +00:00
Tsung-Mao Fang
aa37e1dc4c Fix color lint error 
Test: repo upload is OK.
Bug: 185091944
Change-Id: I52fa596dee5a17b8d29a771a18eced181a00ef6e
 2021-04-12 08:57:21 +00:00
Tsung-Mao Fang
304c68a836 Fix gender issue on subtext of screen pinning 
Create a new string id so that localization team can fix it
individually.

Test: Rebuilt rom and see correct subtext
Fix: 184748174
Change-Id: I3ab644950ee8211c89199446b92e759a5efa4527
 2021-04-12 16:28:03 +08:00
Jeremy Goldman
88ee31e269 Maintain VPN type form the VpnProfile 
the connectedLegacyVpn may already exist within the VpnProfiles. Because
the stub profile generated from the LegacyVpnInfo does not contain type
information, overriding whether the VPN is insecure using this
information will provide an incomplete picture.

Test: atest -c SettingsUnitTests
Bug: 184922172
Change-Id: Icf2e08826c444863eaebdaa47bfd217795d2bad6
 2021-04-12 15:37:19 +08:00
Hugh Chen
38fc9a91b5 Update string 
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"

https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637

Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests

Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
 2021-04-12 14:57:33 +08:00
Jeremy Goldman
8371ee713d Update string for editing an insecure VPN. 
The new string comes from the connectivity s strings document: https://screenshot.googleplex.com/9nQFc9PFwgCYCFV
Test: atest -c SettingsUnitTests
Bug: 176821216
Bug: 184921649

Change-Id: I76257a4a2c2b9d5a49248296676d98980be9d77c
Merged-In: I76257a4a2c2b9d5a49248296676d98980be9d77c
(cherry picked from commit ec4b612932)
 2021-04-12 06:21:27 +00:00
Hugh Chen
8adedc6249 Fix bluetooth settings will broadcast to anywhere when some cases 
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will not allow to set package name and class name to avoid
the attacker.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
 2021-04-12 14:10:42 +08:00
TreeHugger Robot
57a7c9b307 Merge "[Provider Model] Remove "Advanced" from Wi-Fi hotspot settings" into sc-dev 2021-04-12 04:38:07 +00:00
Weng Su
f53c4ca8ae [Provider Model] Remove "Advanced" from Wi-Fi hotspot settings 
- Screenshot:
  https://screenshot.googleplex.com/B4vjvGdcQUL8YCR

Bug: 184907962
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: I934061c9129e77fc37381d1eba4a8107d40131eb
 2021-04-12 11:22:48 +08:00
SongFerng Wang
c7d2169120 Merge "The Network Select shows wrong operator name" into sc-dev 2021-04-12 02:45:52 +00:00
TreeHugger Robot
feb811053f Merge "Modify Wi-Fi network details settings to restricted style" into sc-dev 2021-04-12 02:15:52 +00:00
ykhung
bdaee1431f Send fake data if there is no battey consumption entry list 
Sends fake data into SettingsIntelligence if there is no data in the
battery consumption list, otherwise we don't have battery level data to
draw into the chart graph. We should draw the battery levels if it is
full-charged without any BatteryEntry data.

Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I759e769256f4aa0ec152afff5c265ee3d04c03da
 2021-04-11 22:54:27 +08:00
Chloris Kuo
2c955bbae2 NAS Setting Migration 
Change NAS setting to a toggle setting and move the settings to
Notifications/General

Bug: 173106358
Test: tested manually on device, make RunSettingsRoboTests
Change-Id: I1ba1214511dceea6faf5fb39692d920e761b33d8
 2021-04-10 18:22:44 -07:00
YUKAI HUNG
c024ec7cc9 Merge "Display the chart levels data into BatteryHistoryPreference" into sc-dev 2021-04-10 22:32:27 +00:00
Wesley.CW Wang
f1ca264f69 Refine battery settings layout 
- Add loading text to progress bar to prevent UI flaky
 - Setup enable/disable state for battery saver switch
 - Remove battery saver page divider

Bug: 177964551
Bug: 177964753
Bug: 184626649
Test: make SettingsRoboTests, visually
Change-Id: I8e05c0c0f02710729e1f59eff23fb3f425770de9
 2021-04-10 17:39:14 +00:00
ykhung
40319d9d6f Avoid drawing the invalid levels in the chart view 
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id540f35044beabe4d56ab5ce3af63271ac356f49
 2021-04-10 10:51:47 +00:00
ykhung
740ac9a047 Display the chart levels data into BatteryHistoryPreference 
Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I78718a59671ca6775abc725432fbfbec6c0993fe
 2021-04-10 10:48:09 +00:00
Peter Wang
9b226a4ff0 [automerger skipped] Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567 am: 108ee559ea am: bc52992b42 -s ours 
am skip reason: skip tag Change-Id I6c3f36f1dd99eb4b380dce7218f85757d350bc42 with SHA-1 93ce0688de is already in history

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

Change-Id: I4c8c2737864b5db755da586036aa450d339c2f6d
 2021-04-10 02:05:23 +00:00
Peter Wang
bc52992b42 Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567 am: 108ee559ea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969

Change-Id: I35ee9c8bc08d8cbbbac9d22d47aa75e3fcfcc4dd
 2021-04-10 01:14:56 +00:00
Peter Wang
108ee559ea Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969

Change-Id: I26d0d0be6943bfc691c9b2476dd32f98a5561d50
 2021-04-09 23:26:07 +00:00
Suprabh Shukla
39086c24fd Merge "Changes to "Alarms and Reminders" permission" into sc-dev 2021-04-09 22:27:50 +00:00
Peter Wang
ae74222567 Merge "Fix intent String for starting profile management page in Manifest" 2021-04-09 22:24:58 +00:00
Peter Wang
f40897d27e Fix intent String for starting profile management page in Manifest 
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
Merged-In: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
 2021-04-09 13:33:15 -07:00
Peter Wang
cd263f5535 Merge "Fix intent String for starting profile management page in Manifest" into sc-dev 2021-04-09 20:30:16 +00:00
TreeHugger Robot
8aa0b4a53c [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: 8ec57d3e30 -s ours am: 7ccc647d7b -s ours 
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: Ibfb97d755fbe71a05787cb575600fc38b977f165
 2021-04-09 20:29:46 +00:00
TreeHugger Robot
a6c5c629c1 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: fa9fd4f924 -s ours 
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: I31ee438d2f7425ccd1aa1d87640aabb53336eee7
 2021-04-09 20:03:49 +00:00
TreeHugger Robot
7ccc647d7b [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -s ours am: 00e30fba67 -s ours am: be6b904ec5 -s ours am: 8ec57d3e30 -s ours 
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history

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

Change-Id: Id36ed926f501ab40049c3d76cef814958cf8dfa4
 2021-04-09 19:34:39 +00:00