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

80227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
353b8aa73d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3bb6f3afa1 -s ours am: 1e90c63385 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fcf12294ff4658119a3019b609af949d4141bd3
 2021-03-15 07:23:57 +00:00
Bill Yi
3d9d22259b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c4a622b49 -s ours am: 1b13a3fc1a -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb374a3422604e2646fae73613ee4b8f3e8ef56e
 2021-03-15 07:23:52 +00:00
TreeHugger Robot
1e90c63385 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3bb6f3afa1 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad518d1e586e592527375f4a7ed7797515a8d7be
 2021-03-15 07:07:16 +00:00
Bill Yi
1b13a3fc1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c4a622b49 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82d562515bf9c26ecb4ebca5759acb2b7a05688d
 2021-03-15 07:06:56 +00:00
TreeHugger Robot
e8536198fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d5ab407fce -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia13b965a7a5fe85177b17c4a2dab33bdb89e33d9
 2021-03-15 07:03:30 +00:00
TreeHugger Robot
3bb6f3afa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-15 06:35:45 +00:00
TreeHugger Robot
d5ab407fce Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-15 06:26:57 +00:00
tim peng
4444e59d96 Merge "Show advanced Bluetooth information in device detail page" into sc-dev am: 28d9db3c86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70511221a8f8af7a342a26b14b5bb6d08c2e2a03
 2021-03-15 05:56:50 +00:00
tim peng
28d9db3c86 Merge "Show advanced Bluetooth information in device detail page" into sc-dev 2021-03-15 05:26:45 +00:00
Stanley Wang
95689fb98d Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev am: 9138b055d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849829

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibac01f5a318ec1676a2e71a230e034402cfdabc9
 2021-03-15 03:26:07 +00:00
Stanley Wang
9138b055d2 Merge "Remove the non-translatable tags from MainSwitch titles." into sc-dev 2021-03-15 02:53:56 +00:00
Tim Peng
90df1c9de1 Show advanced Bluetooth information in device detail page 
-Apply new metadata on aosp/1596412

Bug: 182338346
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest
make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest

Change-Id: Ic48ed9213111d0c6ec19b317d4c22e1400261706
 2021-03-15 10:16:14 +08:00
TreeHugger Robot
efe5f38877 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev am: 70e508edd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13839798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia47e99b17a4a9c6e7c4e2f772937f8aa05d2816d
 2021-03-15 02:05:17 +00:00
TreeHugger Robot
70e508edd4 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev 2021-03-15 01:53:00 +00:00
Lucas Lin
efe64ceda5 Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev am: be164d0a55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13779500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icaf48caa54156068b70ff46511de6a6d45be590a
 2021-03-15 01:45:37 +00:00
Lucas Lin
be164d0a55 Merge "Use getPrivateDnsMode() to get the value of private DNS" into sc-dev 2021-03-15 01:00:25 +00:00
Bill Yi
464f6aa64c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic6dd705e34982d51bdd2648bc4f20646d7bd6aba
 2021-03-14 22:14:01 +00:00
Bill Yi
0c4a622b49 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iccfaa49e229aeb8c5365144394c6fd2635ee2a91
 2021-03-14 18:08:33 +00:00
Bill Yi
97e669d333 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iba69fb0c0a9d7edb15865e4444f8d558465ce2f4
 2021-03-14 17:36:32 +00:00
Minche Li
1c0b287637 Merge "Updates magnification settings string" into sc-dev am: 29ff0e0552 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815931

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7351cf5a7fe1fda0dc3e5faa802e2e63a619f87
 2021-03-14 02:32:41 +00:00
Minche Li
29ff0e0552 Merge "Updates magnification settings string" into sc-dev 2021-03-14 02:02:20 +00:00
Yanting Yang
934c20739f Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev am: d604ca93dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849827

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3dce31bffd52863a97bef4bf19389117e71c9a7
 2021-03-13 17:13:40 +00:00
TreeHugger Robot
d2309bb1d5 Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: f575da48e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849842

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8b57f27a85319022bffa88efbba326da9ce7de5
 2021-03-13 17:13:31 +00:00
Yanting Yang
d604ca93dc Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev 2021-03-13 16:56:29 +00:00
TreeHugger Robot
f575da48e5 Merge "Fix the issue of the repo upload hooking checker" into sc-dev 2021-03-13 16:40:53 +00:00
TreeHugger Robot
ee128abea3 Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev am: 041966442f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812148

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36a9a8adcd80f3460f0e206498fe1166250adf8e
 2021-03-13 03:43:36 +00:00
TreeHugger Robot
041966442f Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev 2021-03-13 02:35:13 +00:00
Yu-Han Yang
d8df0d97e2 Move WiFi/Bluetooth scanning toggles to new pages 
Screenshots: http://shortn/_ZmO6y9Zi5S

Bug: 180533061
Test: on device
Change-Id: I1223c9f5641bcc24b3e16af45138643f62849b8b
 2021-03-12 16:52:17 -08:00
TreeHugger Robot
743b22738c Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev am: 38e0dae439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13803384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70f0eeef279584688894d1aceb0fadb2a5c05331
 2021-03-13 00:25:43 +00:00
TreeHugger Robot
38e0dae439 Merge "Transition BatteryInfo and BatteryUtils to BatteryUsageStats API" into sc-dev 2021-03-12 23:52:00 +00:00
Dmitri Plotnikov
820bee81d6 Transition BatteryInfo and BatteryUtils to BatteryUsageStats API 
Bug: 173745486
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryHistoryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoLoaderTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryInfoTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.batterytip.detectors

Change-Id: I469ff8b88aa3307422c02f51943df4ef1759db56
 2021-03-12 14:08:42 -08:00
TreeHugger Robot
cd88d68373 Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev am: 45a3450d6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13781348

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8191fd7cddc79c14ceeb6d18773e122b04cc8021
 2021-03-12 21:06:56 +00:00
TreeHugger Robot
45a3450d6f Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev 2021-03-12 20:51:44 +00:00
SongFerng Wang
a6f9625025 Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev am: 516042b160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib76d93936c087e929fd3e5804adf204b47ae6ba7
 2021-03-12 18:59:59 +00:00
SongFerng Wang
516042b160 Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev 2021-03-12 18:49:49 +00:00
TreeHugger Robot
e7f2851aa8 Merge "Remove interactors from voice input settings" into sc-dev am: 9edb779e45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaeccc4abb6f8d16955f496ef61f6114f7b099006
 2021-03-12 17:16:46 +00:00
TreeHugger Robot
f71786b0c0 Merge "Launch channel settings as half sheet" into sc-dev am: d0fa5b2054 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13844943

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac72b27a93c1ee6a5bfdb21c87c4336ef1e73670
 2021-03-12 17:16:31 +00:00
TreeHugger Robot
9edb779e45 Merge "Remove interactors from voice input settings" into sc-dev 2021-03-12 17:16:16 +00:00
TreeHugger Robot
d0fa5b2054 Merge "Launch channel settings as half sheet" into sc-dev 2021-03-12 16:45:56 +00:00
Julia Reynolds
efe26e2d44 Launch channel settings as half sheet 
If opening app has requested only a subset of fields

Test: manual - launch from an app, filtered and unfiltered, for
normal channels and conversations
Bug: 177246841
Change-Id: Ifd70478101d1ea1340d2ecc55033fab55e65ca92

Change-Id: I5194b959c82b2cfa7990c84285aaf69464cff3a8
 2021-03-12 09:58:41 -05:00
Victoria Lestari
b3729f6675 Remove interactors from voice input settings 
Bug: 180960127

Tested: on device, emulator

Change-Id: I53a74e5d003a662b1e86a1c2d77e73ba84262201
 2021-03-12 14:42:38 +00:00
Sunny Shao
1e508a4280 Fix the issue of the repo upload hooking checker 
Fixes: 182555684
Test: repo upload test
Change-Id: I80a4d4de84b6d54a7b50c325b51b832b7b40b133
 2021-03-12 22:25:10 +08:00
TreeHugger Robot
4679d28db6 Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev am: 8d73578b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849826

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ac030f70fbc04356a83c062e8fbe7f14efa174d
 2021-03-12 13:04:49 +00:00
TreeHugger Robot
8d73578b5f Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev 2021-03-12 12:32:38 +00:00
Stanley Wang
751dff2bf6 Remove the non-translatable tags from MainSwitch titles. 
The titles of MainSwitch need to be translated.

Fix: 182540501
Test: run Robotest
Change-Id: I4a07c599e607644729718543a12d4e9147117e78
 2021-03-12 19:52:07 +08:00
TreeHugger Robot
88b7ac7db2 Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev am: cba72ddc2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9874abefc659053e399b3f36bcc9af8e8aac5f7
 2021-03-12 10:57:34 +00:00
TreeHugger Robot
cba72ddc2e Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev 2021-03-12 10:19:26 +00:00
tim peng
e030f4c335 Merge "Update strings and tag it translatable" into sc-dev am: f90be25ca8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13839796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcdefc489cd0bc8bafaf027378aba37f8100896c
 2021-03-12 09:02:41 +00:00
tim peng
f90be25ca8 Merge "Update strings and tag it translatable" into sc-dev 2021-03-12 08:22:12 +00:00
Yanting Yang
a1a30296ae Fix NPE for ConfigureNotificationSettings 
The NPE is caused by that we have removed the advanced category from
Notification page for android S design but it still tries to get
category and call setInitialExpandedChildrenCount in onCreate().

Only run the relevant logic on the old design since it’s only used to
expand the advanced category and we don’t need the expand feature
anymore for android S.

Bug: 182237530
Fixes: 182532954
Test: robotest & manual
Change-Id: I96f35fa40221079d5498d9d2fab9c75d64698808
 2021-03-12 16:11:23 +08:00