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

81510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ac971ed06c Merge "Prevent failed dynamic index" into sc-dev am: 0c2eb1b553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185090

Change-Id: Ide20b8a92f8b6040b814d5dcdb05fba750d481fe
 2021-04-14 15:28:53 +00:00
TreeHugger Robot
0c2eb1b553 Merge "Prevent failed dynamic index" into sc-dev 2021-04-14 14:58:51 +00:00
TreeHugger Robot
0b6960cf0f Merge "Prevent HTML Injection on the Device Admin request screen" into sc-dev am: ede5041dd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167793

Change-Id: I79fe181ce0ad5807bb877b74c4cbacc66d5227ef
 2021-04-14 12:42:02 +00:00
TreeHugger Robot
ede5041dd6 Merge "Prevent HTML Injection on the Device Admin request screen" into sc-dev 2021-04-14 12:15:19 +00:00
Yanting Yang
62e5f40669 Merge "Use sentence case for display section subheaders" into sc-dev am: 2cfa6e5f39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182156

Change-Id: Id58cc24b2a11e378a46a14459ccab71762ffcfe0
 2021-04-14 11:10:56 +00:00
Yanting Yang
2cfa6e5f39 Merge "Use sentence case for display section subheaders" into sc-dev 2021-04-14 10:47:09 +00:00
Tsung-Mao Fang
5ec0410e5b Prevent failed dynamic index 
In the original design, if a controller in page initializes
failed, then it will impact all the dynamic index mechanism.

In this change, we will only skip controllers in a specfic page.
All other pages which controllers initialize correctly should work
proerly.

Test: See correct dynamic result
Bug: 185325344
Change-Id: I4f959a23635739e1064318ccdddd6d97016dac23
 2021-04-14 18:42:46 +08:00
Tiffany Nguyen
e7066b40c2 Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev am: f9acbaf425 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185089

Change-Id: I7d063062eaf8bd59f76cf47d71c0fffbcdbbd913
 2021-04-14 10:04:12 +00:00
Tiffany Nguyen
a558bbd69b Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev am: ceb78586ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172319

Change-Id: I766b057af4dc4e7e15b9b9d9d2b9653a2ab71ce6
 2021-04-14 10:04:04 +00:00
Tiffany Nguyen
f9acbaf425 Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev 2021-04-14 09:59:41 +00:00
Tiffany Nguyen
b33d03b741 Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface." 
This reverts commit f2e33df51c.

Reason for revert: reverting to include multiple repos (learning something new every day!)

Change-Id: I0909a17f82d18233b20200edcb6011d6fad81fa6
 2021-04-14 09:58:26 +00:00
Tiffany Nguyen
ceb78586ee Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev 2021-04-14 09:19:45 +00:00
Jeremy Goldman
27dc6600f6 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev am: 21eaa6d568 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182147

Change-Id: I9e808af2bb149e7398087979d008aadc85d81deb
 2021-04-14 08:37:01 +00:00
Tsung-Mao Fang
0bf3c98b2f Prevent HTML Injection on the Device Admin request screen 
The root issue is that CharSequence is an interface.
String implements that interface, however, Spanned class
too which is a rich text format that can store HTML code.

The solution is enforce to use String type which won't include
any HTML function.

Test: Rebuilt apk and see the string without HTML style.
Bug: 179042963
Change-Id: I53b460b12da918e022d2f2934f114d205dbaadb0
 2021-04-14 15:51:37 +08:00
Jeremy Goldman
21eaa6d568 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev 2021-04-14 07:49:18 +00:00
Jack He
5255875f33 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f am: ab38192a1f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ia5f8c005e1700fb512f6429125f0d47379d9bc92
 2021-04-14 07:31:52 +00:00
Jack He
ab38192a1f Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ic39e10b36eff5b009886d7a321575f63ef15ba5c
 2021-04-14 06:55:36 +00:00
Yanting Yang
fa16844eb1 Use sentence case for display section subheaders 
Fixes: 184957718
Test: visual
Change-Id: Iba3cdda216d7bf4db4b124886b326a052117f6f4
 2021-04-14 06:34:58 +00:00
Ryan Lin
48fe9f7fc3 Merge "Show the illustration with the given button mode" into sc-dev am: 0e35a6fe07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167785

Change-Id: I56acfcea076055522048725dec665c1a6024e519
 2021-04-14 06:30:15 +00:00
Jack He
130f27d48f Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: I690e850a6b67125a35e999a4faf86a3454140d3f
 2021-04-14 06:07:23 +00:00
Ryan Lin
0e35a6fe07 Merge "Show the illustration with the given button mode" into sc-dev 2021-04-14 05:50:49 +00:00
Jack He
ee25171aa1 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ib4b7dbbc490cbb74954531fbf17b440074cb4447
 2021-04-14 05:23:30 +00:00
Tiffany Nguyen
f2e33df51c Update BatterySettingsFeatureProvider to an activity-friendly interface. 
Test: no impl
Bug: 181827718
Change-Id: I006c7c253df516981240d49fd2590fa68dabb9f2
 2021-04-14 04:50:10 +00:00
Jack He
6de2953232 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" 2021-04-14 04:44:02 +00:00
TreeHugger Robot
98ef59d449 Merge "Add 50% opacity if detect there is no device image yet" into sc-dev am: c9cbe8a572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140159

Change-Id: I946d0b4f2cbbc3aca2ade9b4768c8d05b59533f0
 2021-04-14 04:01:40 +00:00
Jeremy Goldman
eecc97a339 Add additional strings to differentiate between single and multiple 
insecure vpns

Although in english, the strings can be "N not secure", in other
languages translators have requested that we add "VPN" or "VPNs" after
the number for extra clarity. Thus, we split the string into two
depending on whether there is just one or more than one insecure VPN.

Bug: 184167494
Test: atest -c SettingsUnitTests
Change-Id: I93f0cbec5f22ffcac70ddc2ecf640729eef29c04
 2021-04-14 11:52:38 +08:00
TreeHugger Robot
c9cbe8a572 Merge "Add 50% opacity if detect there is no device image yet" into sc-dev 2021-04-14 03:44:16 +00:00
YUKAI HUNG
933e19bed5 Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev am: 9c68e56389 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173736

Change-Id: Ice852cd5a8ccf25c794e199e941cf4f6155c9c8c
 2021-04-14 03:42:23 +00:00
YUKAI HUNG
9c68e56389 Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev 2021-04-14 03:07:33 +00:00
YUKAI HUNG
8d7f68e28d Merge "Load application icon and label from package manager if available" into sc-dev am: 8d8877b6db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167798

Change-Id: I77fc4558b30a9afccd8a7d0d6e64a4171b1fb59d
 2021-04-14 02:32:22 +00:00
YUKAI HUNG
8d8877b6db Merge "Load application icon and label from package manager if available" into sc-dev 2021-04-14 01:58:37 +00:00
Dmitri Plotnikov
456b0996fc Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev am: 26db6e5f8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162520

Change-Id: Id6e5bb90010b3964e854920f3dae3ffe8bed181c
 2021-04-13 23:49:21 +00:00
Dmitri Plotnikov
26db6e5f8e Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev 2021-04-13 23:44:29 +00:00
TreeHugger Robot
d64f9c3d14 Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev am: ea4ab07b63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173190

Change-Id: I759b217a29afd6dded9eba0a7ff5f7906a38455a
 2021-04-13 22:39:50 +00:00
TreeHugger Robot
ea4ab07b63 Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev 2021-04-13 21:54:12 +00:00
Jack He
8cc23bd2fe BT: Use DeviceConfig for Bluetooth GD toggle 
Bug: 184235563
Test: make and toggle GD settings, unit test
Change-Id: I643339f80a82950b1b1ffcf60830f93a955e6666
 2021-04-13 20:31:38 +00:00
Sally Yuen
3feaa92a95 Merge "Add a banner for RBC/Extra Dim" into sc-dev am: 12166e5bb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14165431

Change-Id: I398050d0924d8a49f65177d5a91c2925678e63fc
 2021-04-13 17:13:00 +00:00
ykhung
8483ea48b9 Export loadNameAndIcon() method out for BatteryDiffEntry reusing. 
Bug: 185187669
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iedb37546f6f08751174d977d962aec44539f2fb8
 2021-04-14 01:01:48 +08:00
Sally Yuen
12166e5bb1 Merge "Add a banner for RBC/Extra Dim" into sc-dev 2021-04-13 16:18:57 +00:00
Winson
3cb64ab6ad Update getOwnersForDomain usage to SortedSet 
From API feedback, the return type of this method was updated.
Migrating was fairly simple.

Bug: 184891031

Test: manual, launch settings screen on device

Change-Id: Ic159093b5d3f592de0b3533cf26bf0c878e06a30
 2021-04-13 08:40:14 -07:00
ykhung
db88c994b4 Load application icon and label from package manager if available 
Bug: 185187669
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id612f0f1db51d538abb41fc711b9350d9a147cb8
 2021-04-13 23:12:12 +08:00
Weng Su
3af3569b92 Merge "[Provider Model] Move down the Internet unavailable Wi-Fi" into sc-dev am: 96f73e20aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160589

Change-Id: I8ee98708c96ba296fbd74f666dc2830dcfec9a76
 2021-04-13 08:50:04 +00:00
ryanlwlin
2c5570e9fc Show the illustration with the given button mode 
Currently we support two modes of software shortcut.
We should change the illustration depending on the mode.

Bug: 185193333
Test: manually test
Change-Id: I54f800ead984c22cebec1de4ac15c022b0bcbb3d
 2021-04-13 16:21:41 +08:00
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
7834be7823 Merge changes I7771a43b,If613c5cf into sc-dev am: 1871275fbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160593

Change-Id: If2786b42478ac86f43be32d63babc335a384e772
 2021-04-13 06:53:22 +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
Wesley Wang
e62270a171 Merge "Reorder battery tips priority" into sc-dev am: 6f0a0da428 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158864

Change-Id: Ic675151a0269f6aa0326e6dd6636e56a7920e49b
 2021-04-13 04:27:26 +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