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

11669 Commits

Author SHA1 Message Date
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
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
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
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
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
Abel Tesfaye
9435e52d3f Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev am: 473fffa318 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989325

Change-Id: I534663b249ccb4cda1b32918b1c68feb275458d3
 2021-04-09 17:10:41 +00:00
Abel Tesfaye
473fffa318 Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev 2021-04-09 16:31:36 +00:00
Weng Su
688fa772b9 Modify Wi-Fi network details settings to restricted style 
- Show restricted text in guest mode

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

Bug: 177573895
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Change-Id: I64c8d82518d47c7f96802f505efa380c63b9e10c
 2021-04-09 23:10:24 +08:00
ykhung
52a0f72c87 Add kill-switch to distinguish chart or non-chart design am: cdd73e7fec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14127336

Change-Id: Icc86474ce123f8ae8d128d8dbfda23d896d071d1
 2021-04-09 10:57:11 +00:00
ykhung
cdd73e7fec Add kill-switch to distinguish chart or non-chart design 
Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iacbb012209d552b58b774f90f5b0aeb60ce6d33d
 2021-04-09 07:21:06 +00:00
Wesley Wang
fecca0ec3f Merge "Support help message when battery is unavailable(1/2)" into sc-dev am: 57f27f7a30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124308

Change-Id: I7b4da94c19efcf4b5af8a838adbb05865dc330e1
 2021-04-09 05:12:34 +00:00
Wesley Wang
57f27f7a30 Merge "Support help message when battery is unavailable(1/2)" into sc-dev 2021-04-09 04:43:06 +00:00
ykhung
057307c89c Add getBatteryHistory method to query data from SettingsIntelligence am: 318cc18f25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14119822

Change-Id: I1327aa3f0b10a066b59d8cf08dd5febb16d10e85
 2021-04-09 03:42:58 +00:00
Wesley.CW Wang
756028aadd Support help message when battery is unavailable(1/2) 
- Present help preference when battery is unavailable

Bug: 179237551
Test: make SettingsRoboTests
Change-Id: If6e82210d831123cb1169d53a18d24cb2c576b10
 2021-04-09 11:24:51 +08:00
ykhung
318cc18f25 Add getBatteryHistory method to query data from SettingsIntelligence 
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Idd640f8f8b07311fafc76f7b61c96c453ae7b604
 2021-04-09 01:31:32 +00:00
Abel Tesfaye
5d6438391f Add warning message when camera privacy lock is enabled for screen attention settings 
Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=AdaptiveSleepCameraStatePreferenceControllerTest,
AdaptiveSleepPreferenceControllerTest

Bug: 177462182
Change-Id: I9880d6b82e9a5040534aceda4ff15275e0bcf72a
 2021-04-08 19:40:58 +00:00
Oli Lan
ee93f873a6 Merge "Use DeviceConfig property for default value of clipboard access notification setting." into sc-dev am: b914ec91f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13877345

Change-Id: I077bf3de71784fa79672a77dd90d492de6263038
 2021-04-08 12:05:18 +00:00
Oli Lan
b914ec91f1 Merge "Use DeviceConfig property for default value of clipboard access notification setting." into sc-dev 2021-04-08 11:31:12 +00:00
Wesley Wang
ff847ec1c3 Merge "Update battery states text to support battery feature(1/2)" into sc-dev am: 1e3a18a355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111141

Change-Id: I3d57d2ce88ae0c64955a091920863236979c706c
 2021-04-08 11:17:13 +00:00
Wesley.CW Wang
6148438546 Update battery states text am: 11d74e7231 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14098542

Change-Id: I74a61775c7e6e364d294922fed90e3a45e20d0d9
 2021-04-08 08:01:02 +00:00
Wesley.CW Wang
d324393fac Update battery states text to support battery feature(1/2) 
- Update progress bar bottom text when receiving battery feature callback

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: Ic8b24cbb149f7e470d28327a9a1dd84bbd5673f7
 2021-04-08 06:39:22 +00:00
Wesley.CW Wang
11d74e7231 Update battery states text 
- Update progress bar bottom text when battery states changed(charging,
 discharging, power saver and low battery)

Bug: 183689347
Bug: 177407113
Test: make SettingsRoboTests
Change-Id: I0397eb1dea7fcb14357750f84d1d5b1a7dc7d19a
 2021-04-08 05:10:34 +00:00
Suprabh Shukla
202bd8581a Changes to "Alarms and Reminders" permission 
Calling AlarmManager to know the state of the permission, which is now
the source of truth, as the logic deciding the state of the permission
may change.
Also killing the app when the permission changes to denied, this avoids
the app maintaining stale state about this permission.

Test: make -j RunSettingsRoboTests
atest SettingsUnitTests:AppStateAlarmsAndRemindersBridgeTest

Manually: Toggle the state of an app to "Not allowed" and check the logs
for activity manager kill messages.

Bug: 181152252
Bug: 183136253
Change-Id: I438782eaef4caae50fd76685c675a3e45ee28d9f
 2021-04-07 16:06:09 -07:00
YUKAI HUNG
e005379e2c Merge "Remove options menu from BatteryUsage to align material next" into sc-dev am: 8477cf1892 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14112967

Change-Id: I9f957ce3c0e957b8c3ff9a53024910266f25ae62
 2021-04-07 19:06:19 +00:00
Abel Tesfaye
14c5ba8648 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev am: 28ad67dac2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13857227

Change-Id: I077e308dd13308a6767c8b16e9b22a0e0906ebfd
 2021-04-07 19:03:58 +00:00
YUKAI HUNG
8477cf1892 Merge "Remove options menu from BatteryUsage to align material next" into sc-dev 2021-04-07 17:17:04 +00:00
Abel Tesfaye
28ad67dac2 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev 2021-04-07 17:13:44 +00:00
ykhung
48dce3c0b7 Remove options menu from BatteryUsage to align material next 
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I846668283d8c210f3b30fcf8c0ba5949588310d3
 2021-04-07 16:03:34 +00:00
YUKAI HUNG
a13c0160e9 Merge "Remove the current battery usage chart and replace it with new one" into sc-dev am: babe3b0e73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111128

Change-Id: Ia1c23e7f70d463a575b0efbcb5cf654e0b0c4927
 2021-04-07 15:30:59 +00:00
Wesley.CW Wang
7f372c74ef Update StringUtil#formatElapsedTime method (2/3) am: 50f314e45d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063748

Change-Id: Idb5dad8aa7105650d6a6cc7155d8e2786b0bc4d5
 2021-04-07 12:22:33 +00:00
ykhung
1599313caf Remove the current battery usage chart and replace it with new one 
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I06f0eb5c09d07a9db0d1a93cda751e8fad672c79
 2021-04-07 11:52:16 +00:00
Wesley.CW Wang
50f314e45d Update StringUtil#formatElapsedTime method (2/3) 
- Update the usage and the test case
 - Update discharging string to follow new string doc

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I1e14e7da8cb02755d8cf6e12626a0d94fad87121
 2021-04-07 10:19:10 +00:00
TreeHugger Robot
3fc4a00faa Merge "Refine the summary of "Open by default" in "App info" page" into sc-dev am: acacad4cdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14100754

Change-Id: If7aaa999c20776b38dbae10087b48a3e399e561a
 2021-04-07 09:50:58 +00:00
TreeHugger Robot
acacad4cdf Merge "Refine the summary of "Open by default" in "App info" page" into sc-dev 2021-04-07 09:26:24 +00:00
ykhung
a4c8c4440e Move the battery components from SettingsGoogle to Settings am: b350c66d97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108646

Change-Id: Ib025b2d4ab25a3ea743f4e1934aaf771d4ef0533
 2021-04-07 08:32:28 +00:00
ykhung
b350c66d97 Move the battery components from SettingsGoogle to Settings 
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I47cbba1cbfd6cb17745e7aaaf56b22e3c9dcd30e
 2021-04-07 12:09:54 +08:00
Abel Tesfaye
b7a66b3068 Add warning message when camera privacy lock is enabled for 
smart auto rotate settings fragment

Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=SmartAutoRotateCameraStateControllerTest,SmartAutoRotateControllerTest

Bug: 177462182
Change-Id: If443bd2456f3fbe76876777be912b204a50f4088
 2021-04-06 19:49:04 +00:00
Kholoud Mohamed
4572279ca2 Merge "Ignore failing test" into sc-dev am: 0a848989f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14100777

Change-Id: I5bed5de7b78a2d038a40348b532527359374673c
 2021-04-06 13:57:45 +00:00
Kholoud Mohamed
0a848989f2 Merge "Ignore failing test" into sc-dev 2021-04-06 13:37:12 +00:00
kholoud mohamed
f89306dace Ignore failing test 
Temporarily ignore the following failing presubmit test until the culprit
change is found
InteractAcrossProfilesDetailsTest#getPreferenceSummary_appOpNotAllowed_returnsNotAllowed

Test: atest InteractAcrossProfilesDetailsTest
Bug: 184238335
Change-Id: Ia6aa957bc0928e3a82465f35eda99938d34f19c4
 2021-04-06 14:36:05 +01:00
Sunny Shao
41db38c0af Refine the summary of "Open by default" in "App info" page 
Fixes: 184597364
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.appinfo
Change-Id: I9e453c719e5d06570ab1093ffe5510c3e9c7567b
 2021-04-06 17:35:57 +08:00
Sally Yuen
2b2c5631d7 Merge "[Reduce Bright Colors] Use a switch preference" into sc-dev am: 9aff855052 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13719274

Change-Id: Ide66887df44b1ea331275a9766c7ac7ee7d5dfec
 2021-04-05 18:49:10 +00:00
Sally Yuen
9aff855052 Merge "[Reduce Bright Colors] Use a switch preference" into sc-dev 2021-04-05 16:15:31 +00:00
sallyyuen
166c89890e [Reduce Bright Colors] Use a switch preference 
Test: atest ReduceBrightColorsPreferenceControllerTest, manual
Bug: 128465252
Change-Id: I824af24e545d38bad74613147328cf51108a9127
 2021-04-05 16:14:59 +00:00