PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,202 Commits 1 Branch 0 Tags
03a0e1f76e10c11f5904253ab4265fa1ea7182d6
Commit Graph

101202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
03a0e1f76e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70d210b974 
Blank merge reason: commit message contains skip directive

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

Change-Id: I6a955910c7423fd7969b75e6aba20c9f04628313
 2022-03-23 18:18:39 +00:00
Bill Yi
70d210b974 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1925648483a881594f948162c6167facdcc3b268
 2022-03-23 18:17:31 +00:00
Chaohui Wang
ba394bec83 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: I49044c2b8fd210d20ed6437f9e1cad0e081644fd
 2022-03-23 13:22:17 +00:00
Chaohui Wang
8ba7ed6451 Merge "Fix SetupChooseLockPasswordTest" into tm-dev 2022-03-23 13:09:19 +00:00
Chaohui Wang
1933ffacab Fix SetupChooseLockPasswordTest 
Test fail is caused by method getVisibleScreenLockTypes() renamed to getVisibleAndEnabledScreenLockTypes() in
https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/14269154

Fix: 201021223
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password.SetupChooseLockPasswordTest"
Change-Id: Idcc7a9794217c1ef81ca4a26351e26773b18ccad
 2022-03-23 17:19:21 +08:00
TreeHugger Robot
e8334d9bb1 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: I4bf75ada3b1291d0a457d424c82fd266f0a2949f
 2022-03-23 08:47:53 +00:00
TreeHugger Robot
a12da0a8e8 Merge "Fix adding wifi configuration issue" into tm-dev 2022-03-23 08:27:47 +00:00
TreeHugger Robot
2bba6ac214 Merge "Add visibility control for the UiBlocker" into tm-dev am: a387297687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119094

Change-Id: Ie0493ba0da7865dcbc4fe9cd1b20e079664d7781
 2022-03-23 08:18:35 +00:00
TreeHugger Robot
a387297687 Merge "Add visibility control for the UiBlocker" into tm-dev 2022-03-23 08:14:46 +00:00
TreeHugger Robot
47f05534d2 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I3a4865ccc802fa80256965b080977bef9891e50c
 2022-03-23 08:11:11 +00:00
TreeHugger Robot
764d7f4b73 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev 2022-03-23 08:00:05 +00:00
TreeHugger Robot
4de69b01a3 Merge "Update the string" into tm-dev am: 53fa29af01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17341684

Change-Id: I630c98bc22722afb09a0a835b570c2b6776d8d39
 2022-03-23 07:26:28 +00:00
TreeHugger Robot
53fa29af01 Merge "Update the string" into tm-dev 2022-03-23 07:11:54 +00:00
Gary Jian
47e14df7cb Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da am: e1356cdb64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I71c344d0c3eea2f26c6d0ab4db2bf28e28cb65ff
 2022-03-23 07:04:26 +00:00
Gary Jian
e1356cdb64 Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: I12e5aa6274b2db7f70a231d8b6512f40d32ff8a9
 2022-03-23 06:56:17 +00:00
Gary Jian
24888461da Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Icbe95d63e86ef204fec957757a8f8b49ef77ac82
 2022-03-23 06:34:55 +00:00
Gary Jian
41ec2bc89b Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223

Change-Id: Ia08609cddc63034e3f9d02f64727d92fe9e2348f
 2022-03-23 06:11:41 +00:00
Gary Jian
78b2b241a9 Merge "Add a developer option to controll mockmodemservice permission" 2022-03-23 05:46:22 +00:00
Kevin Han
7c8166e851 Merge "Update hibernation toggle string" into tm-dev am: 46adb8e175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17304592

Change-Id: Ibd698dd496b29770d5f1112871408e96cf0ff32e
 2022-03-23 04:37:43 +00:00
Kevin Han
46adb8e175 Merge "Update hibernation toggle string" into tm-dev 2022-03-23 04:24:38 +00:00
SongFerng Wang
210a422be0 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7 am: 08e5d43e54 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I139f8be6d4dea2b92ba7e0676c83c01f235d50eb
 2022-03-23 03:18:43 +00:00
Hugh Chen
b355af9a87 Update the string 
Bug: 225982666
Test: build pass
Change-Id: I47a9a27fedcc657d1cbd41708607174486d33fc2
 2022-03-23 03:04:23 +00:00
SongFerng Wang
08e5d43e54 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I1a191387a358a40da753539284bba70d050a9bcd
 2022-03-23 02:54:26 +00:00
SongFerng Wang
eefaf62ba7 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: Iabc7d3cf66470bd96c2b5caac2469eac888b2ae2
 2022-03-23 02:34:07 +00:00
SongFerng Wang
285952a80e Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
 2022-03-23 02:11:19 +00:00
SongFerng Wang
75869b5fef Merge "[LE adudio] The condition of right location is wrong." 2022-03-23 01:52:05 +00:00
Weng Su
f5cd7140f4 Fix adding wifi configuration issue 
- The Wi-Fi Enterprise Restrictions add a new
  UserManager.DISALLOW_ADD_WIFI_CONFIG restriction from T.

- When a user requests to add Wi-Fi configuration, Settings will
  reject the request if the user is not allowed.

- The above restriction need to be retrieved in advance so that the
  user's request will not be rejected.

- See the result screenshot in b/224459753#comment8

Bug: 224459753
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivity

Change-Id: I2dfb6b9946dd9dbd4eb8bf0f6549ac5cb4466f17
 2022-03-23 06:18:55 +08:00
Kweku Adams
45b3c9f280 Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: If6df2836e323f94f99c4fd1a629ff015253a11b2
 2022-03-22 19:06:45 +00:00
Kweku Adams
81e1f511d7 Merge "Make reward constants configurable." into tm-dev am: 32edc913a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I8fc365e90a44177b5f5dc25a9f8a9e513c36bb99
 2022-03-22 19:06:38 +00:00
Kweku Adams
240e85be9f Merge "Fix inaccessible view issue." into tm-dev 2022-03-22 18:59:25 +00:00
SongFerngWang
418d78f978 [LE adudio] The condition of right location is wrong. 
1. Fix the condition of right location.
2. If the location is left+right, showing the legacy battery style.

Bug: 225800014
Test: build pass. local test.
Change-Id: I03d1d7bfe26d52e0b69d24aec6bd3216350403a0
 2022-03-23 02:55:06 +08:00
Kweku Adams
32edc913a7 Merge "Make reward constants configurable." into tm-dev 2022-03-22 18:45:36 +00:00
Eric Biggers
b28d6c6c76 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Icc017c4f8cfeba0e0d5eabcbb592337bf296fbf0
 2022-03-22 18:31:43 +00:00
Weng Su
98d30c880d Fix ConnectivityManager.requestNetwork crash issue when try again 
- When the user requests "try again", the Network-Request-Dialog will be
  recreated. If the Wi-Fi framework sends the callback result at this
  time, the Network-Request-Dialog may not be ready at the moment,
  causing the NPE to crash.

- Add NPE checks to avoid crash issues.

Bug: 220679437
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=NetworkRequestDialogActivityTest

Change-Id: I8e48a29649e72d9f8c67c4ac24f0eb27ba600dae
 2022-03-22 18:14:22 +00:00
Eric Biggers
98ac6a6c01 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I46e1ca934dff648e8730d445046fa3150913891b
 2022-03-22 18:04:27 +00:00
Eric Biggers
b79a82260c Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1
 2022-03-22 17:47:03 +00:00
Eric Biggers
465363a312 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieadee7a7c884500a836b5f118fce9b649e9e179b
 2022-03-22 17:46:14 +00:00
Eric Biggers
d106ae0f82 Merge "Remove EXTRA_KEY_TYPE intent data" 2022-03-22 17:37:33 +00:00
Kweku Adams
eee64f2f73 Fix inaccessible view issue. 
When fully expanded, the last item in the ExpandableListView was half
off the screen, making it hard to see what the value was and update it.
Tweaking the layout to ensure the last item is properly visible.

Bug: 158300259
Bug: 189850067
Test: Visual inspection
Change-Id: Ifc60e220276db6ee6d4dea57957b0b52b1934dbe
 2022-03-22 17:37:22 +00:00
Kweku Adams
10ef599170 Make reward constants configurable. 
Make it possible to configure the instant and max values of all
supported actions. Ongoing rewards will be enabled later.

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: Ia854f18820f3fe95b3b1448c5fa8411853859052
 2022-03-22 17:37:07 +00:00
TreeHugger Robot
5f6672c459 Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747

Change-Id: I8f887febbba78ad0e002322c846375dd5883eb65
 2022-03-22 14:48:09 +00:00
TreeHugger Robot
285cfcda41 Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev 2022-03-22 14:42:43 +00:00
Yuri Ufimtsev
f295baf541 Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603

Change-Id: Ie8a10ade44a05142451df6fdccc8ac6262a66bd2
 2022-03-22 13:55:38 +00:00
Yuri Ufimtsev
aa30c6c595 Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743

Change-Id: Ieb3dc8368db13a43d95c981d2602d182d7ccbf01
 2022-03-22 13:55:02 +00:00
Yuri Ufimtsev
b39ab3e1c4 Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev 2022-03-22 13:41:33 +00:00
Yuri Ufimtsev
7e7d3f898e Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev 2022-03-22 13:41:09 +00:00
Chaohui Wang
209c747910 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: I82eca0f59431a6fb16fb6909844fda7d78480fcf
 2022-03-22 12:24:53 +00:00
PETER LIANG
bd67c07268 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 679e6a140e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312729

Change-Id: Iea6e169d4db4ba9bb2ad31d85388cc9978d60176
 2022-03-22 12:24:24 +00:00
Chaohui Wang
9512dfd7a2 Merge "Fix SetupSkipDialogTest" into tm-dev 2022-03-22 12:11:04 +00:00
PETER LIANG
679e6a140e Merge "Polish and humanize the strings for the preview of mail content." into tm-dev 2022-03-22 12:08:19 +00:00