PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,504 Commits 1 Branch 0 Tags
04f42d146d492719448bf269e6de34371ec04845
Commit Graph

80504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
04f42d146d Merge "Moving the error messages from slice to panel's subtitle" into sc-dev am: 45726b937b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812558

Change-Id: I1b39d00f88fa1774a15f0b7ecd1b7e917da8641d
 2021-03-18 05:10:21 +00:00
TreeHugger Robot
90bd5be192 Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev am: 46fdf4d5be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868211

Change-Id: Ieb16a593e3d32e99007101edb6e0270ce7b3a7d0
 2021-03-18 05:10:15 +00:00
Jason Hsu
ba2c4f5bf0 [automerger skipped] Merge changes from topic "accessibility_floating_menu_ui" into sc-dev am: b1f6c4658c -s ours 
am skip reason: skip tag Change-Id I123baaf3684d5cbb0a33fc2383da72aa022876c0 with SHA-1 c2057ae257 is already in history

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

Change-Id: I086cab70a2b8de72332d03197a446ee63369e8ec
 2021-03-18 05:09:52 +00:00
Yanting Yang
bf8d9d7490 Merge "Fix NPE of AppVersionPreferenceController" into sc-dev am: 8f414f2e0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13886027

Change-Id: I98435d5ac5e267d6eb8ad7e1757a2add2bbec742
 2021-03-18 05:09:35 +00:00
Treehugger Robot
5250026c04 [automerger skipped] Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a am: 207fa629bc am: e5dfff612b -s ours am: 6da9386097 -s ours 
am skip reason: skip tag Change-Id I8f1d11558b1be575a0777ed195abe027e838cb74 with SHA-1 ffbe4e9b1e is already in history

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

Change-Id: Iff259a56f19ca75214e2c962de59180d811d861c
 2021-03-18 05:09:17 +00:00
Chiachang Wang
46dfbb55a6 Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7 am: 168298f426 am: 75014e693d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: I7ec0105478a0e73ba8c9e87c4962b872297c5995
 2021-03-18 05:06:43 +00:00
SongFerng Wang
45726b937b Merge "Moving the error messages from slice to panel's subtitle" into sc-dev 2021-03-18 04:58:50 +00:00
TreeHugger Robot
46fdf4d5be Merge "Transition HighUsageDetector to BatteryUsageStats API" into sc-dev 2021-03-18 04:57:29 +00:00
Jason Hsu
b1f6c4658c Merge changes from topic "accessibility_floating_menu_ui" into sc-dev 
* changes:
  Remove half circle option in size selector
  Update the vector drawable for accessibility button preview preference
  Remove the accessibility gesture tutorial dialog in system navigation
  Update the dialog content for accessibility floating menu
  Add the preference controller to control accessibility button fade preference
  Add the preference controller to control accessibility button preview preference
  Add the preference controller to control accessibility button opacity preference
  Add the preference controller to control accessibility button size preference
  Add the preference controller to control accessibility button location preference
  Setup basic layout and resources for the accessibility button settings page
 2021-03-18 04:54:54 +00:00
Yanting Yang
8f414f2e0f Merge "Fix NPE of AppVersionPreferenceController" into sc-dev 2021-03-18 04:48:54 +00:00
Treehugger Robot
6da9386097 [automerger skipped] Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a am: 207fa629bc am: e5dfff612b -s ours 
am skip reason: skip tag Change-Id I8f1d11558b1be575a0777ed195abe027e838cb74 with SHA-1 ffbe4e9b1e is already in history

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

Change-Id: I6de4ffcf98cc084a55e774aca898240dc48af7bc
 2021-03-18 04:35:41 +00:00
Chiachang Wang
75014e693d Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7 am: 168298f426 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: Ie8f4aad4c3d89e5b06800d61719478d6b4b7afdd
 2021-03-18 04:34:00 +00:00
Dmitri Plotnikov
0e853e53d3 Merge "Remove references to BatteryStatsHelper from AppBatteryPreferenceController" into sc-dev am: b72d0ee651 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863822

Change-Id: I26af5e38484e379b589c1dfe14a8d3ee16dc745c
 2021-03-18 04:02:19 +00:00
TreeHugger Robot
544617a706 Merge "Hide non-system overlay windows in RequestIgnoreBatteryOptimizations." into sc-dev am: 735281a739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13902431

Change-Id: I0c52ff4243fe576dfb7d7d6651e2579fd0603880
 2021-03-18 04:01:33 +00:00
Treehugger Robot
e5dfff612b Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a am: 207fa629bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940

Change-Id: I4fda2ca5e2415431af1d7178064e3f05e46d2715
 2021-03-18 03:41:57 +00:00
Chiachang Wang
168298f426 Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 am: 3ad73342c7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: I7e7ec3721de73523f52718665bc1763f75184a56
 2021-03-18 03:41:16 +00:00
Dmitri Plotnikov
8f6c946c82 Transition HighUsageDetector to BatteryUsageStats API 
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests

Change-Id: Ie8f90a67e4dd16fa67cf4f44a3678a789b3da18a
 2021-03-18 03:32:43 +00:00
Dmitri Plotnikov
b72d0ee651 Merge "Remove references to BatteryStatsHelper from AppBatteryPreferenceController" into sc-dev 2021-03-18 03:32:28 +00:00
TreeHugger Robot
735281a739 Merge "Hide non-system overlay windows in RequestIgnoreBatteryOptimizations." into sc-dev 2021-03-18 03:28:19 +00:00
Treehugger Robot
207fa629bc Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940

Change-Id: I7aa0702f04c1f876851661ea54ba289b5eb9234d
 2021-03-18 03:25:20 +00:00
Chiachang Wang
3ad73342c7 Merge "Replace the hidden ProxyInfo methods usage" am: 2f66e59e05 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641827

Change-Id: If019c9b540f58e82b250693ed05dfabcda2c7c66
 2021-03-18 03:19:28 +00:00
Treehugger Robot
959325e88a Merge "Replace hidden CM#isNetworkSupported() usage" 2021-03-18 02:39:21 +00:00
Chiachang Wang
2f66e59e05 Merge "Replace the hidden ProxyInfo methods usage" 2021-03-18 02:37:00 +00:00
Chiachang Wang
ce97d11d5f Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae am: f60f9ec14c am: 77dc754137 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: Iff4054c1e77b1bc229b4010f625db0e214521a4b
 2021-03-18 02:17:57 +00:00
Chiachang Wang
77dc754137 Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae am: f60f9ec14c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: I904f5ec889d40113bf232f7935a98c6da030c9c3
 2021-03-18 01:43:58 +00:00
Chiachang Wang
f60f9ec14c Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 am: cda53ebeae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: Ie3a809e901745d7143d0b2b48023f2ddd3671480
 2021-03-18 01:18:45 +00:00
Chiachang Wang
cda53ebeae Merge "Replace the way to access StaticIpConfiguration" am: dd61e5d664 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641821

Change-Id: I6794a8d8113b5167b24e875554bc54b9155dd97f
 2021-03-18 00:42:40 +00:00
Chiachang Wang
dd61e5d664 Merge "Replace the way to access StaticIpConfiguration" 2021-03-18 00:23:14 +00:00
Dmitri Plotnikov
296dce404e Remove references to BatteryStatsHelper from AppBatteryPreferenceController 
Bug: 173745486
Bug: 180630447
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests
Change-Id: Ic836d9f5e791d1e3ddc2237ff108190e53dcac19
 2021-03-17 23:40:45 +00:00
Lucas Lin
c5844949ad [automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d am: ddbd32432e am: 5c73826020 -s ours am: a565961bf0 -s ours 
am skip reason: skip tag Change-Id I6c06460b67f81112db311f0739457d5f1e2e4554 with SHA-1 8ffc3908ff is already in history

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

Change-Id: I416f3e7af6a09e5e6b5b80cdbd6749ce04fc2f5a
 2021-03-17 22:25:51 +00:00
Peter Wang
3091978e7a Merge "Fix coding styles for erase euicc only options" into sc-dev am: 3f7d415e2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13894357

Change-Id: I72404bc62312ee671238323332b970fad54d1510
 2021-03-17 22:20:04 +00:00
Lucas Lin
a565961bf0 [automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d am: ddbd32432e am: 5c73826020 -s ours 
am skip reason: skip tag Change-Id I6c06460b67f81112db311f0739457d5f1e2e4554 with SHA-1 8ffc3908ff is already in history

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

Change-Id: Ia2b0bf14f32d65ad0f5e44100b9dcc3402b21a3b
 2021-03-17 22:13:33 +00:00
Peter Wang
3f7d415e2d Merge "Fix coding styles for erase euicc only options" into sc-dev 2021-03-17 22:09:04 +00:00
TreeHugger Robot
d53fa89b32 Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6 am: 2bec77689e am: 09861022ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828

Change-Id: I5ec713bef2af649b387aa199f2f1de7b94f8b31e
 2021-03-17 22:05:45 +00:00
TreeHugger Robot
09861022ab Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6 am: 2bec77689e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828

Change-Id: I82b251563ecf1b12ae4b733bcc2aa8a1dffd2d19
 2021-03-17 22:04:40 +00:00
Colin Cross
1871042664 Merge "resolve merge conflicts of d42d9a41f6 to sc-dev" into sc-dev am: 321f413343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13904045

Change-Id: I019ec2f2f5ed6ec8d2be519d821ee7f139af4bb3
 2021-03-17 22:02:02 +00:00
Colin Cross
321f413343 Merge "resolve merge conflicts of d42d9a41f6 to sc-dev" into sc-dev 2021-03-17 21:43:07 +00:00
Dmitri Plotnikov
87c1d43500 Transition BatteryAppListPreferences to BatteryUsageStats API am: 036dc189b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863806

Change-Id: I0507d54255368b6c9ea4fa05b7da2b9322deb326
 2021-03-17 21:37:06 +00:00
Dmitri Plotnikov
b108acaad0 Merge "Remove smearing of hidden BatterySipper power" into sc-dev am: dba51aa233 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13855858

Change-Id: I7c1c8c6a8ceb7fb39534f2b3f65582492df99908
 2021-03-17 21:32:58 +00:00
TreeHugger Robot
7471ad05c2 Merge "Hide "recent access" and "see all" when location off" into sc-dev am: 0cfa67f8a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13896392

Change-Id: Iad657de7b8d2db603761218f00d693ba59242fd8
 2021-03-17 21:14:33 +00:00
Yanli Wan
1f23717f1c Merge "Update Device Admin Info admin message for a financed device" into sc-dev am: 3eecb32108 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892070

Change-Id: I74da80074007ef13e57bcf8aca63b801857bcec6
 2021-03-17 21:14:25 +00:00
TreeHugger Robot
3375e5b8bf Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev am: 60cc9e507b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13821292

Change-Id: I026fe95e25df6f8f257118ca7f6a89838fae8345
 2021-03-17 21:14:17 +00:00
TreeHugger Robot
651e08c8a1 Merge "FakeUid: measured energy for Wifi, Bluetooth" into sc-dev am: 99b3468b1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13838208

Change-Id: Idb961520cbb443650c7d021e0b164116230d73c4
 2021-03-17 21:14:04 +00:00
Lucas Lin
90ff110c47 [automerger skipped] Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af am: e30a49423b -s ours am: 162d7df130 -s ours 
am skip reason: skip tag Change-Id I024c3ddfb85f4c3d177e2e99294c998d81d4e08d with SHA-1 b07054ca9c is already in history

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

Change-Id: Ib749302ff523c8740eb1c52694b3af3a8ab5a0d2
 2021-03-17 21:04:45 +00:00
Dmitri Plotnikov
036dc189b6 Transition BatteryAppListPreferences to BatteryUsageStats API 
Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests

Change-Id: I7af8cbcd27433b89cb2184750c6854aa74761d0d
 2021-03-17 13:23:25 -07:00
Dmitri Plotnikov
dba51aa233 Merge "Remove smearing of hidden BatterySipper power" into sc-dev 2021-03-17 20:19:27 +00:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev 
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
 2021-03-17 19:09:29 +00:00
TreeHugger Robot
0cfa67f8a8 Merge "Hide "recent access" and "see all" when location off" into sc-dev 2021-03-17 18:50:01 +00:00
Varun Shah
90321d45fb Hide non-system overlay windows in RequestIgnoreBatteryOptimizations. 
Add SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to
SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS.

Bug: 182165099
Test: manual (test PoC)
Change-Id: Iddf697c1e8945f49c6222605c67f8f98e9c418a9
 2021-03-17 10:38:56 -07:00
Yanli Wan
3eecb32108 Merge "Update Device Admin Info admin message for a financed device" into sc-dev 2021-03-17 17:35:36 +00:00