PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,955 Commits 1 Branch 0 Tags
d42db7ebbf2bc923677f35e1e1ef2a967e3fc38d
Commit Graph

15259 Commits

Author SHA1 Message Date
TreeHugger Robot
40f8910e8f Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev am: 57919fbcfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16063843

Change-Id: Ia964565d7a79b311b34e7be235ebb7c38b92793c
 2021-10-18 15:25:25 +00:00
TreeHugger Robot
57919fbcfb Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" into sc-v2-dev 2021-10-18 15:08:46 +00:00
Yuri Lin
8cab46f57a Merge "Merge messages & conversations settings for DND priority senders." 2021-10-18 15:03:27 +00:00
ykhung
4c1702cf2a Add missed "optional_uses_libs" to avoid testing failed 
After adding the missed "optional_uses_libs" I can run the SettingsRoboTests test locally (screenshot: https://screenshot.googleplex.com/3nLrCwX4bLHGxvP)

Bug: 203408618
Test: make SettingsRoboTests
Change-Id: I1bfdb2204fe89c8d0dbcfb347d10fa74853051e9
 2021-10-18 14:38:08 +00:00
Wesley.CW Wang
d11dec2f82 Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition" 
- Reverts commit e7cca4cd81
 - Add try-catch to handle unexpected operate

Reason for revert: Previous fix will cause a side effect which makes app stuck at Optimize mode after switching state from Unrestricted to Optimize, add a try catch to handle previous issue first

BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy naming, not edit by this code change

Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
Merged-In: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
 2021-10-18 09:03:06 +00:00
SongFerng Wang
fce5b4b405 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 17fb53a1ad am: e590239085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: I34849b225700f7ccf74f16ac5f52cf4572ccc285
 2021-10-18 08:54:13 +00:00
SongFerng Wang
e590239085 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 17fb53a1ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: Ib4049920f72b9534ca744e33b7553856184248b1
 2021-10-18 08:41:54 +00:00
SongFerng Wang
17fb53a1ad Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: Idc12ca6b932fc9143a4c83729af16b82fae1669e
 2021-10-18 08:25:21 +00:00
SongFerng Wang
190e926aab Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: I7179fea2bf2925e5950bfffbad8289302a5ca772
 2021-10-18 08:25:19 +00:00
SongFerng Wang
11af4846b2 Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev 2021-10-18 08:13:49 +00:00
changbetty
064aa91e45 Add package name check for the calling app 
Bug: 198661951
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest
Change-Id: I68a543a5c9a5b74db30780f6a6d9f9bc9c6eec08
 2021-10-18 03:17:06 +00:00
TreeHugger Robot
a59d04fc76 Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe am: 49bd615d6b am: ea805db192 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I344b090fe19a804c2212022038c7084dc5b8789d
 2021-10-15 20:47:06 +00:00
TreeHugger Robot
ea805db192 Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe am: 49bd615d6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I1be4a0c1aaf8a0d30943b7669ae96e2b41363088
 2021-10-15 20:32:46 +00:00
TreeHugger Robot
49bd615d6b Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: Ie08d46288074ae6df95535d203728a9b81c4c8c5
 2021-10-15 20:21:03 +00:00
TreeHugger Robot
bb0c2c4fc7 Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447

Change-Id: I8a9eabbbf330dbb2db33c4d0ce000403e55be99d
 2021-10-15 20:21:02 +00:00
TreeHugger Robot
c5cc2f81fe Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev 2021-10-15 20:05:38 +00:00
Julia Reynolds
b60116fa55 Clear up unused code 
Test: make
Bug: 194833441
Change-Id: Icff8fe689626a6e92a119f9ed1a58656d15fbb47
 2021-10-15 14:27:17 -04:00
changbetty
bfd3020038 For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off 
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
 2021-10-15 11:18:07 +00:00
changbetty
5145c2db59 To use the getLaunchedFromPackage to get the actual package name 
Bug: 170642995
Bug: 199176115
Test: Manual test
Test: atest -c RequestToggleWiFiActivityTest
Change-Id: I821e374d8762861f63185d20db2f75f05b503540
 2021-10-15 08:00:40 +00:00
Roopa Sattiraju
8c5137e3b3 Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6 am: ebc8a9fd1c am: 04e10ffc28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I073a5c88f41f227c315ac072ad026b6be424efda
 2021-10-14 18:57:53 +00:00
Roopa Sattiraju
04e10ffc28 Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6 am: ebc8a9fd1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I1261f696aa6d7a74c6b5bcdcc6e961fb7302d760
 2021-10-14 18:46:52 +00:00
Roopa Sattiraju
ebc8a9fd1c Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I3eb45e51e9e4cb2a5940d4fd2c928b509f49dc5d
 2021-10-14 18:32:20 +00:00
TreeHugger Robot
08390e9e87 Merge "Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"" 2021-10-14 11:18:19 +00:00
SongFerngWang
050b6d5224 The Network name is not same as statusbar at SIM Edit page 
Using subscriptionInfo to get the network name.

Bug: 203035698
Bug: 201591202
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest (PASS)

Change-Id: I84848a2801172b46f7cc3ff39d88ad57e34514a4
 2021-10-14 19:08:47 +08:00
YUKAI HUNG
6d75dc803f Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle " into sc-v2-dev am: c4f761c079 am: 3d0d6a38aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048454

Change-Id: I112627c5f6f56f95e8195f7c5be458da09cc5adf
 2021-10-14 10:06:19 +00:00
YUKAI HUNG
3d0d6a38aa Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle " into sc-v2-dev am: c4f761c079 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048454

Change-Id: Iaa9b0143b6dfc96aba4fd83982f2ebeb0c2bd575
 2021-10-14 09:56:48 +00:00
YUKAI HUNG
c4f761c079 Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle " into sc-v2-dev 2021-10-14 09:44:47 +00:00
YUKAI HUNG
b1e10399cc [B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle 
This reverts commit 9de5fe158d.

Reason for revert: revert it too based on ag/16048452

Change-Id: I97ffcfcbc37fb4a99e66213023b95af759d1ed3e
 2021-10-14 09:34:27 +00:00
Wesley Wang
b900e0e43b Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition" 
This reverts commit 3f7839cad0.

Reason for revert: This fix will cause a side effect which makes app switch state from Unrestricted to Optimize then it will lock at Optimize mode only, will prepare other cl to fix the previous issue

Change-Id: Ic5232eb0099fa1591f15e72747eca4d08b9af9b9
 2021-10-14 09:31:13 +00:00
Chienyuan
1b9a21ffb5 RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" 
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
(cherry picked from commit 5be9255ddf)
 2021-10-14 08:47:16 +00:00
Shaowei Shen
7a4715c7fe Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev am: a6fc26dd45 am: bbff2d4bd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926634

Change-Id: Ibd5a8815b353591384cc624b81a9127a4b72c98f
 2021-10-13 12:21:03 +00:00
Shaowei Shen
bbff2d4bd3 Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev am: a6fc26dd45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926634

Change-Id: I751ee13a0ab20cb9caefb8388866dd35c8a3590c
 2021-10-13 12:11:45 +00:00
Shaowei Shen
a6fc26dd45 Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev 2021-10-13 12:01:47 +00:00
shaoweishen
fb164fe128 [Sound panel] Update Ui layout to match with mertial next 
please check bug for before/after screenshot.

Bug: 191317779
Test: verified on device
Change-Id: Ia570dde71ce9f18376eaba48102cecde6adb85bb
 2021-10-12 14:24:09 +00:00
Menghan Li
f4c50ff1af Merge "Apply fade transition for font size and display size Suw page" into sc-v2-dev am: 502f53619f am: a6e6cfbee1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16001288

Change-Id: Ic09486a53a972451dc7548f1ffa4c4fba23c67ca
 2021-10-12 13:45:45 +00:00
Menghan Li
a6e6cfbee1 Merge "Apply fade transition for font size and display size Suw page" into sc-v2-dev am: 502f53619f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16001288

Change-Id: I349e5f81d0124ae90cc7149424491dcb12b73282
 2021-10-12 13:33:20 +00:00
Menghan Li
502f53619f Merge "Apply fade transition for font size and display size Suw page" into sc-v2-dev 2021-10-12 13:31:57 +00:00
Jason Chiu
e65d3ab1cc Revert "Revert "Support highlightable Settings homepage menu for 2-pane"" am: 29a09e55ba am: 235353a131 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038013

Change-Id: I4c526a0854fbe64efb834bf993c1e461b7993cad
 2021-10-12 11:12:26 +00:00
Jason Chiu
235353a131 Revert "Revert "Support highlightable Settings homepage menu for 2-pane"" am: 29a09e55ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038013

Change-Id: I599f443a720cccc3c3e5a784a689cf2df1cc7fc3
 2021-10-12 10:58:00 +00:00
Jason Chiu
29a09e55ba Revert "Revert "Support highlightable Settings homepage menu for 2-pane"" 
This reverts commit 096c090b80.

Reason for revert: crash is fixed in this change

Bug: 202510128
Test: manual, build
Change-Id: Ifff8d58cfdcf43e123b11dee308665b2617cb4b3
 2021-10-12 09:32:07 +00:00
TreeHugger Robot
0c8a97ff73 Merge "Remove connection preferences "Files received via Bluetooth"" 2021-10-12 07:14:07 +00:00
menghanli
71aca3b7a9 Apply fade transition for font size and display size Suw page 
- Create font size & screen size controler to simply xml
- Add onPuase animation

Bug: 194447311
Test: atest AccessibilityScreenSizeForSetupWizardActivityTest
Test: atest FontSizePreferenceControllerTest
Test: atest ScreenSizePreferenceControllerTest
Change-Id: I91f3fd4c22aba4f8cd46f6e82e50987544942245
 2021-10-12 09:48:16 +08:00
Antoan Angelov
e17b0850ee Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51 am: c32f18a7c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135

Change-Id: I340c4a735b6eda7409f67dab1bcd8252c04a41b1
 2021-10-08 18:49:16 +00:00
Antoan Angelov
c32f18a7c5 Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev am: 3bc6b32b51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15853135

Change-Id: Iaf3272d30b5c54a89525989e9d91ea0c3429c879
 2021-10-08 18:36:40 +00:00
Antoan Angelov
3bc6b32b51 Merge "Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag" into sc-v2-dev 2021-10-08 18:23:50 +00:00
Chienyuan
5be9255ddf Remove connection preferences "Files received via Bluetooth" 
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
 2021-10-09 01:19:00 +08:00
Greg Kaiser
d659a5271b Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40 am: 3f638ebad8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469

Change-Id: I8a3deba2be06113f781f399221a8463f5454ceee
 2021-10-08 15:12:13 +00:00
Greg Kaiser
3f638ebad8 Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469

Change-Id: I01497de4d02a9a2868af8f2611eb20b24f61b20f
 2021-10-08 14:56:25 +00:00
Greg Kaiser
1ab7ad3e40 Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev 2021-10-08 14:48:14 +00:00
Greg Kaiser
096c090b80 Revert "Support highlightable Settings homepage menu for 2-pane" 
This reverts commit 9037ceabd3.

Reason for revert: Presumed cause of b/202510128

Change-Id: I0daaab95d9bc57229c0c8c916cbe3ada7aafb6fa
 2021-10-08 14:29:06 +00:00