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

81697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fb8b6198c2 Merge "NAS Setting Migration" into sc-dev am: ccd2bfc1a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13923001

Change-Id: I20634338c39397650e75f7c069f396454d4d536b
 2021-04-12 17:43:18 +00: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
f724367ed9 Merge "Use ConstraintLayut to improve UI of storage items" into sc-dev am: 588e4e8d8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111144

Change-Id: If11715a4183ab2d5d105861037b63d0d11d5901a
 2021-04-12 14:04:31 +00: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
eae0433642 Merge "Maintain VPN type form the VpnProfile" into sc-dev am: 4ee56ab90d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158852

Change-Id: I1985e93ed4a1b2f908bb48516a17e91f2053d525
 2021-04-12 10:54: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
76d6f894bc Merge "Fix gender issue on subtext of screen pinning" into sc-dev am: 2216765159 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158858

Change-Id: Iffc73845dc84b248b8d8d46284e19e29441912d6
 2021-04-12 09:54:23 +00:00
TreeHugger Robot
179da6ed66 Merge "Fix color lint error" into sc-dev am: e63e2a781c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158856

Change-Id: I8111b0e1e11f7b3c5142f7dc60bd09cd26bc6764
 2021-04-12 09:53:00 +00: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
66bd818370 [automerger skipped] Update string for editing an insecure VPN. am: 8371ee713d -s ours 
am skip reason: skip tag Change-Id I76257a4a2c2b9d5a49248296676d98980be9d77c with SHA-1 ec4b612932 is already in history

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

Change-Id: I2afc952ece6f8af0b625efd2eebc5a7053ae1fff
 2021-04-12 08:06:32 +00: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
TreeHugger Robot
65f8d3ab94 Merge "[Provider Model] Remove "Advanced" from Wi-Fi hotspot settings" into sc-dev am: 57a7c9b307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140160

Change-Id: I97d797de91a6bab291e864f4754b485fd6aacc21
 2021-04-12 05:04:37 +00: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
8991225949 Merge "The Network Select shows wrong operator name" into sc-dev am: c7d2169120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140145

Change-Id: I7e70fc63e1e17bddfe38455717af5e24d9a9df7c
 2021-04-12 02:49:09 +00:00
TreeHugger Robot
ce080e6c66 Merge "Modify Wi-Fi network details settings to restricted style" into sc-dev am: feb811053f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140148

Change-Id: Ie4643781afc9e05773b08547e3d1f24a10ea4d55
 2021-04-12 02:48:49 +00: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
305cb2d95c Send fake data if there is no battey consumption entry list am: bdaee1431f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140156

Change-Id: I185246d4516efe96c72bc0c4c853ccfb5d8be3aa
 2021-04-11 16:51:29 +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
f04f05909b Merge "Display the chart levels data into BatteryHistoryPreference" into sc-dev am: c024ec7cc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14139205

Change-Id: I7088d92d2d29ba068df34dfa47b143a72e8c386d
 2021-04-10 22:59:59 +00: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
f75feb6ee5 Refine battery settings layout am: f1ca264f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14139746

Change-Id: I4468c1dc24f6df57aafc2bf524db64d7af0a4e07
 2021-04-10 18:35:26 +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
803f99a5d7 Avoid drawing the invalid levels in the chart view am: 40319d9d6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140152

Change-Id: I3cf7a4764aa3cf30ef370796e51f58bb496f74f3
 2021-04-10 14:19:18 +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
6caba15727 [automerger skipped] Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567 am: 108ee559ea am: bc52992b42 -s ours am: 9b226a4ff0 -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: I5508aefa48c7e55097ea875453059b6134553714
 2021-04-10 02:44:47 +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
a4d354f673 Merge "Changes to "Alarms and Reminders" permission" into sc-dev am: 39086c24fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14095813

Change-Id: I644442b4d41b343bfc1aebcc2c42ac2f9dc7ce82
 2021-04-09 23:00:09 +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
83770d66ff Merge "Fix intent String for starting profile management page in Manifest" into sc-dev am: cd263f5535 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14143405

Change-Id: If2e7f35367c6c9c1900cc6cdaae83c95222c9b1f
 2021-04-09 20:46:59 +00:00
TreeHugger Robot
c8b4de3727 [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: 8aa0b4a53c -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: Ib1056d4d13a330c6b780a32a63a6a8acf39a8f99
 2021-04-09 20:46:53 +00:00
TreeHugger Robot
7a820c6e64 [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: a6c5c629c1 -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: Ie814222916dea5e36bfb3bb36894376775205445
 2021-04-09 20:46:15 +00:00