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

80324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f43aa28809 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: I6e9c2fc4e71a0dc0c5d98bd100c019cfb4cbb986
 2021-03-17 22:21:28 +00:00
Colin Cross
2a4761ab15 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: I01072029e853261efefedf30bafa16c66a110661
 2021-03-17 22:19:40 +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
321f413343 Merge "resolve merge conflicts of d42d9a41f6 to sc-dev" into sc-dev 2021-03-17 21:43:07 +00:00
Dmitri Plotnikov
42249f9852 Transition BatteryAppListPreferences to BatteryUsageStats API am: 036dc189b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13863806

Change-Id: I2565c9c9c3c23acebae7df8f7f20c28eca2d57b6
 2021-03-17 21:14:51 +00:00
Dmitri Plotnikov
f2d52e55d8 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: I2ab415eee4a98914c326c68a209c803f273e52a2
 2021-03-17 21:14:25 +00:00
TreeHugger Robot
463fa4b828 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: Ie86df82c2e4043635e99d92c3b4e48aa3ffb5b90
 2021-03-17 21:13:47 +00:00
Yanli Wan
0d461b4408 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: I04cd044eb52658777e4fd32ca16ccb47a0db13a8
 2021-03-17 21:10:27 +00:00
TreeHugger Robot
63d4165b98 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: I420c8350efe267eb661db9124ebe70178e13279d
 2021-03-17 20:58:56 +00:00
TreeHugger Robot
b0b9c1065e 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: I7bbd2107adab49b052e68479466f41e0e4499655
 2021-03-17 20:54:20 +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
Lucas Lin
f2d2abaaff [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: I40968dde0a36b2576a7dcd7f1f2b91e64677ce6b
 2021-03-17 19:43:14 +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
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
Dmitri Plotnikov
f941a684e1 Remove smearing of hidden BatterySipper power 
Bug: 182598424
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.appinfo.AppBatteryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest

Change-Id: I78b8d7c4faafa83de198005617e99a7f54bcd174
 2021-03-17 17:01:39 +00:00
TreeHugger Robot
60cc9e507b Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev 2021-03-17 16:57:42 +00:00
Yu-Han Yang
9e0f9b1dda Hide "recent access" and "see all" when location off 
This CL also does the following:
- Change "past 24 hour access" to "recent access"
- Add timestamp to recent access app
- Remove the summary of "Location Services" button

Bug: 180533061
Test: on device
Change-Id: I0405cb6f363243db9f2c9ccf8ab8788b633d1564
 2021-03-17 09:36:56 -07:00
TreeHugger Robot
99b3468b1c Merge "FakeUid: measured energy for Wifi, Bluetooth" into sc-dev 2021-03-17 16:32:53 +00:00
Lucas Lin
162d7df130 [automerger skipped] Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889 am: 73c971a5af am: e30a49423b -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: I5bd375b31ad388ca507852d8be8e259693320655
 2021-03-17 16:05:22 +00:00
Chiachang Wang
13d03f41b9 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev am: 6f41bb5722 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892870

Change-Id: Ia1cf2b31e8aba0ae944ceca2dad0ffd9fde7b9c0
 2021-03-17 15:31:46 +00:00
Chiachang Wang
6f41bb5722 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev 2021-03-17 15:21:17 +00:00
TreeHugger Robot
bebef20ae9 Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev am: c7d3c5f1be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815935

Change-Id: I4cbafaba92c18f490c673a9d06750b7dfe586ea2
 2021-03-17 10:50:37 +00:00
TreeHugger Robot
c7d3c5f1be Merge "[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen" into sc-dev 2021-03-17 10:30:48 +00:00
Chiachang Wang
ffbe4e9b1e Replace hidden CM#isNetworkSupported() usage 
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.

Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
 2021-03-17 15:21:43 +08:00
TreeHugger Robot
76b437502b Merge "Update string for Intent Picker" into sc-dev am: fdb6af2d20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13892866

Change-Id: I8d8510291d42a9986fa8786666faea19de54ca6e
 2021-03-17 06:41:50 +00:00
TreeHugger Robot
d522b2325c Merge "[Provider Model] Update airplane mode icon" into sc-dev am: c35e0bfa58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885664

Change-Id: I045fa25395643c654c17a5d6eab90cc05bfcaa87
 2021-03-17 06:41:44 +00:00
TreeHugger Robot
fdb6af2d20 Merge "Update string for Intent Picker" into sc-dev 2021-03-17 06:35:14 +00:00
TreeHugger Robot
c35e0bfa58 Merge "[Provider Model] Update airplane mode icon" into sc-dev 2021-03-17 06:16:20 +00:00
Edgar Wang
caabd509fe Merge "Change packagename of TwoTargetPreference" into sc-dev am: 0c914077aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13566505

Change-Id: Ic7249f7aa910eead9e0650f00700d13c38afc617
 2021-03-17 05:20:15 +00:00
Edgar Wang
0c914077aa Merge "Change packagename of TwoTargetPreference" into sc-dev 2021-03-17 05:08:21 +00:00
Lucas Lin
0ab1accbf1 Merge "Change the parameter type from ContentResolver to Context" into sc-dev am: 78a02d76c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885645

Change-Id: I97f2cd3cbac8add7405204e4d16968ac4ba1c855
 2021-03-17 03:46:20 +00:00
Lucas Lin
78a02d76c4 Merge "Change the parameter type from ContentResolver to Context" into sc-dev 2021-03-17 03:27:28 +00:00
Sunny Shao
5b541f082b Update string for Intent Picker 
- Replace the "Supported links open in this app" with the
  "Allow web links to open in this app".

bug: 177923646
Test: compilation
Change-Id: I90c8a2f133bd35cf6e59ebe10dec40e06cb34cdf
 2021-03-17 11:07:54 +08:00
TreeHugger Robot
1e037fd813 Merge "Allow SettingsMainSwitchBars to be disabled" into sc-dev am: 8105206432 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887336

Change-Id: Ie291f5d6c84bd4227788407415185f7f751fb862
 2021-03-17 02:25:47 +00:00
TreeHugger Robot
8105206432 Merge "Allow SettingsMainSwitchBars to be disabled" into sc-dev 2021-03-17 01:56:40 +00:00
TreeHugger Robot
2bec77689e Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828

Change-Id: I8972ff3ca02d7ebd435f65a8eef5228b9a20fbc5
 2021-03-16 23:54:35 +00:00
TreeHugger Robot
a5ea519cc6 Merge "Only display single line for title" into rvc-qpr-dev 2021-03-16 23:29:09 +00:00
Salud Lemus
ae41810b23 Update Device Admin Info admin message for a financed device 
Bug: 182804474
Test: Used a test device that is registered via ZT

Change-Id: I7e2d3342ac0e71485a80823a8d565c95a00fee7a
 2021-03-16 21:21:49 +00:00
Julia Reynolds
5166e3939d Allow SettingsMainSwitchBars to be disabled 
Test: manual, looking at notification settings
Fixes: 182859292
Change-Id: I06db2a0984b0dcbf71a69fc8f58e54b4670652a8
 2021-03-16 14:55:18 -04:00
Rajeev Kumar
19eb802e10 Merge "Update Device Admin Info Settings text for a financed device" into sc-dev am: d2ca004392 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879788

Change-Id: I033950c94e9f0e1e2e11c3b6e773c6aa2b2a23c9
 2021-03-16 17:18:00 +00:00
Rajeev Kumar
738abeaa37 Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev am: 815558188f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13879789

Change-Id: I715824dd4ba3dd48fbb60f1b9100dac880aa7da5
 2021-03-16 17:17:23 +00:00
Rajeev Kumar
d2ca004392 Merge "Update Device Admin Info Settings text for a financed device" into sc-dev 2021-03-16 16:50:35 +00:00
Rajeev Kumar
815558188f Merge "Undo making Image icon's visibility to GONE in Action Not Allowed Dialog for a financed device" into sc-dev 2021-03-16 16:50:02 +00:00
Weng Su
a15019ce88 [Provider Model] Update airplane mode icon 
- Screenshot:
  https://screenshot.googleplex.com/ULE5bL6sxXKzdN6

Bug: 182438540
Test: manual test
Change-Id: I2ef2cfa40d6fbc6bc164d57ca981bc216dacede4
 2021-03-16 22:57:41 +08:00
Bonian Chen
d42d9a41f6 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
 2021-03-16 14:45:42 +00:00
Tsung-Mao Fang
b713bf7638 Revert "Add javadoc about lifecycles for xml defined Controllers." am: 23562377b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885648

Change-Id: I58fc191944f694b7a283c738b3535691abf56bb4
 2021-03-16 14:09:48 +00:00
Tsung-Mao Fang
28eb1f4f0e Revert "Use androidx LifecycleObserver for wiring up controller ..." am: da9d5a1f92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13885647

Change-Id: I85561a372f6f2a0e06c853fed2c90b990b657a1c
 2021-03-16 14:09:47 +00:00
Bonian Chen
c27980c1a9 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I365757ae7bb17cabb39e377eb23aaf4ac97013b9
 2021-03-16 14:09:39 +00:00