Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,554 Commits 1 Branch 0 Tags
249de94deaf6b7c7b48cf08b5969b3a80c2009b0
Commit Graph

87554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b2fff02b47 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: Ia06899eded9d3d29dffa8713d3c604ed94582f37
 2021-04-12 05:08:11 +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
fd992408c9 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: Iae7948ee2a54a6b435f9eb016cc861a8282eb633
 2021-04-12 02:49:31 +00:00
TreeHugger Robot
0fc34be653 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: I4d091eb891b83a3c0c4c4ebc072b30c9c7bb3bcb
 2021-04-12 02:49:24 +00: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
740de3a8ee 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: I48ebdb0daaa41c83a263b44815e4b46dfa08f66e
 2021-04-11 16:54:15 +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
072ef0dc08 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: Icecc7c7e3f22d1f5dc78c33f33c46855804cfbed
 2021-04-10 23:00:12 +00: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
b11a8a7021 Refine battery settings layout am: f1ca264f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14139746

Change-Id: I044a534cc1941262525d2e63655726553e7117f0
 2021-04-10 18:35:35 +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
563e020a6e 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: I94bead9dcd5ba0aca946a710433694d85a9b584a
 2021-04-10 14:19:26 +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
33ea694c47 [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: I3d8667bec2a1f9379ef8ee00afd0b3355229d47e
 2021-04-10 02:44:58 +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
821580db53 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: Ie946b122e29ec7ea99fbcb60d048acee825426fd
 2021-04-09 23:00:19 +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
Peter Wang
7cd3ba0af9 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: Id7da8caf6a1a748979464f224e095a6860cd1c54
 2021-04-09 20:46:48 +00:00
TreeHugger Robot
fb611d7e21 [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: I7a010fd98f67badba82e2139c70a5f3bb6a20c3a
 2021-04-09 20:46:44 +00:00
TreeHugger Robot
5921534d1e [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: I449888f68a2df71eaec32b923ac76f990134f048
 2021-04-09 20:46:29 +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
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
TreeHugger Robot
fa9fd4f924 [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 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: Ia88db4d0b98ebbcd5c1114cf21673bbbd73a217b
 2021-04-09 18:57:07 +00:00
TreeHugger Robot
8ec57d3e30 [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 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: I92487706addaddda44613b00903c4dd5c862de3a
 2021-04-09 18:52:26 +00:00
Peter Wang
93ce0688de Fix intent String for starting profile management page in Manifest 
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
 2021-04-09 11:49:34 -07:00
TreeHugger Robot
be6b904ec5 [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 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: I8dae5afba2b9b3ad00a1c7d8ec0d254abd706901
 2021-04-09 18:10:21 +00:00
TreeHugger Robot
cdb1cdaef4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fe40f85cca -s ours am: 8974b83e8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e090e0bd4776644bc18492ed349df568a774061
 2021-04-09 17:27:37 +00:00
TreeHugger Robot
00e30fba67 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550 -s ours am: c3edd0b379 -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: I0f596d744078240f574e6f998cbb7dd9e8d09dfd
 2021-04-09 17:27:01 +00:00