PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,467 Commits 1 Branch 0 Tags
48a68e11f88821f1234df0965f9a2a7c689a248c
Commit Graph

96467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cd10fa3120 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-29 07:32:58 +00:00
Xin Li
d4a9a1e98a [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours am: 32f9c41a53 -s ours am: 6fc837c6e7 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I5d420c1da7ec84ad3159ae7fec86c4d5375f21a2
 2021-09-29 06:26:49 +00:00
TreeHugger Robot
8932ba55a8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-29 06:19:23 +00:00
Xin Li
6fc837c6e7 [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours am: 32f9c41a53 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: Ib58f4593f1bfc0bcda852298e331a8b27f0b9d25
 2021-09-29 06:06:02 +00:00
Xin Li
32f9c41a53 [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I223a4cfd2637ea81a139c186a640b2078cb62fc0
 2021-09-29 05:52:02 +00:00
Xin Li
dc818b7b1f [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I8efcd178648ac15b8a32e75f7481c5943af94af4
 2021-09-29 05:38:41 +00:00
Arc Wang
54f619dfb8 [Large screen] Disable/enable DeepLinkHomepageActivity 
This change enable/disable DeepLinkHomepageActivity according to
SplitController#isSplitSupported when receiving PRE_BOOT_COMPLETED.

PRE_BOOT_COMPLETED is an Intent which broadcasts once when the user
is booting after a system update.

Bug: 201236463
Bug: 201237323
Test: manual
      1. On a large screen device, Launcher -> Wallpaper & style
         Observe it uses intent ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
      2. On a small screen device, Launcher -> Wallpaper & style
         Observe it does NOT use intent ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
Change-Id: Icf6ab6d0cba38224c4b80276141d84a8468da760
 2021-09-29 03:39:35 +00:00
YUKAI HUNG
185c1597d9 Merge "Invoke close() method for BatteryUsageStats to close cursor window" 2021-09-29 03:27:10 +00:00
TreeHugger Robot
f5d0a1e6b0 Merge "Do not update the previously connected devices for the sub device" 2021-09-29 01:40:22 +00:00
Xin Li
8aa74d1ad4 Merge SP1A.210812.016 
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
 2021-09-28 19:39:58 +00:00
ykhung
454698d97e Invoke close() method for BatteryUsageStats to close cursor window 
invoke close() method for BatteryUsageStats to close cursor window,
since BatteryUsageStats will implement "Closeable" interface in T.
(from Dimitri's request)

Bug: 201229421
Test: make SettingsRoboTests
Change-Id: Ibfca404d00cce51405cffddb636f685869ac130b
 2021-09-29 00:44:11 +08:00
Xin Li
15707e7858 [automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 am: 7a7b87716f am: d62dc93bff -s ours am: 9d07b3b7fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1feff9c45a5905100a743f8c945934d4c78c82a0
 2021-09-28 15:39:26 +00:00
Xin Li
9d07b3b7fa [automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 am: 7a7b87716f am: d62dc93bff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12ecb3ea819c98b2befffa6e0e4b83c46019d172
 2021-09-28 15:22:47 +00:00
Xin Li
d62dc93bff DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 am: 7a7b87716f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I618b06ffd1b1e9029575a4f7d080dcb0c5329b60
 2021-09-28 15:01:42 +00:00
Xin Li
7a7b87716f DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I9ed0817f2ef9449e472476dfd5ed54b4e126bd5d
 2021-09-28 14:43:13 +00:00
ykhung
96a8e63ebd [Robustness] protect get battery stats from DeadSystemException am: e893a890ca am: f63b2e08da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926630

Change-Id: I3730258d026f39fe0e31e080128d812231ca3e00
 2021-09-28 11:48:53 +00:00
ykhung
f63b2e08da [Robustness] protect get battery stats from DeadSystemException am: e893a890ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926630

Change-Id: I3b7223abc84971b2d9051d2c777a37c85404985a
 2021-09-28 11:33:46 +00:00
Alice Kuo
a6d549fee3 Do not update the previously connected devices for the sub device 
As bluetooth turn on, and device reboot, UI will show the sub device
entry for hearing aid device or csip device. Check if the device is a sub device, do not update the cachedDevice information.

Bug: 150670922
Bug: 178981521
Test: bonded with a coordinated set. Check the UI only have one entry as Bluetooth turn on and device reboot.
Change-Id: I03dfdc25b57e614194fb8de2c9265edd50760d30
 2021-09-28 10:25:06 +00:00
ykhung
e893a890ca [Robustness] protect get battery stats from DeadSystemException 
Refine the original workaround patch in the ag/15527095 from NPE to
return default BatteryUsageStats instance as we merged in the
ag/15919139 (align the same solution).

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Ic03e8296d16ecb8629155f75727e9cde48c303eb
 2021-09-28 10:00:50 +00:00
Bill Yi
39812e84c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib6505319ebf6b05ecfee3e8fd410a0052a9c6b62
 2021-09-28 09:08:38 +00:00
Bill Yi
069684e925 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5025bf1696bea34629632b29351fc463f33ef27d
 2021-09-28 09:04:57 +00:00
Bill Yi
703cbfb58b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 2p: 337aa028ef 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ib261327f491dfc81ba506b8adb110cf7ef9dc51f
 2021-09-28 09:01:39 +00:00
Bill Yi
43b9cb669c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iea597fedb4bf06eae6760f6d313bc8f7909f2077
 2021-09-28 09:01:34 +00:00
Bill Yi
a27f0eaf3d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 
Blank merge reason: commit message contains skip directive

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

Change-Id: I0ab870320ff4498bd159cef7c9659eef3ce00139
 2021-09-28 09:01:33 +00:00
Bill Yi
337aa028ef [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 
Blank merge reason: commit message contains skip directive

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

Change-Id: I051189c06198c31f1ba36cb9dad14f0652ce1ae7
 2021-09-28 09:01:33 +00:00
Bill Yi
3769790fed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cf6feb89d6b5418866abcb32e14d00eaaae73ef
 2021-09-28 09:01:22 +00:00
Bill Yi
86b1ce74e4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6749f3f0202d0107bd2486f216186a4c06e65087
 2021-09-28 08:57:21 +00:00
Bill Yi
fc1e2ae64b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c348d5230 
Blank merge reason: commit message contains skip directive

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

Change-Id: I5c5a56b92935d4d97bef2098649704a9a3a62ea1
 2021-09-28 08:46:44 +00:00
Bill Yi
2c348d5230 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2c9945f74f76929129318310a17f2d74b08d65f8
 2021-09-28 08:46:31 +00:00
YUKAI HUNG
592b2a76e0 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours am: d9db89af86 -s ours am: 8f2938221a -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: Iaffdfdc6daa38a77a46dcd7fd730a973c04a7560
 2021-09-28 08:07:21 +00:00
YUKAI HUNG
82d3ae0a27 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 0c99e2b1c8 am: f4d84faee7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I39d9df79aa6f8b237d701fabff606bad8418ed87
 2021-09-28 08:07:16 +00:00
YUKAI HUNG
dfea91b1ae [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef am: 5e32dec664 -s ours am: 301bdd05d4 -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: Ie9e684d3cbc987f653f0026e9972a236d72e1036
 2021-09-28 08:07:10 +00:00
YUKAI HUNG
8cb845c31e Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 4f513d7237 am: 3d6fc7d275 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I2ff62cabc826e97e5a887e36208eecdfe778f77c
 2021-09-28 08:07:02 +00:00
Xin Li
c41a577e37 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged 
Merged-In: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
Change-Id: I90b2538fb0737a35170b87864c776d94f575418f
 2021-09-28 07:55:18 +00:00
YUKAI HUNG
8f2938221a [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours am: d9db89af86 -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: I04b9ecf8bf34eaa52aee9cb2e176c0de95024e9b
 2021-09-28 07:53:44 +00:00
YUKAI HUNG
f4d84faee7 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 0c99e2b1c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I9d596ccce1459e92c244fb013e3933c0f357ffb8
 2021-09-28 07:53:39 +00:00
YUKAI HUNG
301bdd05d4 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef am: 5e32dec664 -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: Id1c00fe8ff9ad03edb8392331fd9613c07296197
 2021-09-28 07:53:14 +00:00
YUKAI HUNG
3d6fc7d275 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 4f513d7237 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I235cc4cb1dfabccdcb901e2de5eca1a33a237ad0
 2021-09-28 07:53:07 +00:00
Syaoran Kuo
5fed474020 Use power manager instead of adb to wake up screen. 
Fix this before merger back from sc-v2, to prevent merge conflict.


Bug: 201253586
Test: atest SettingsComponentTests
Change-Id: I08871e744e201a10ddbfdf41e3a40df8c65b9865
 2021-09-28 07:35:16 +00:00
YUKAI HUNG
5e32dec664 Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139

Change-Id: I92e32ec565c45d58b28c1430693f5fba11780844
 2021-09-28 07:30:26 +00:00
YUKAI HUNG
d9db89af86 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: I176606ea2e056d6cb109fdf4dc03b2fe7ceffdcb
 2021-09-28 07:30:19 +00:00
YUKAI HUNG
0c99e2b1c8 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I71ccb502dc5e7697b5f54daa803a56bba1e2c565
 2021-09-28 07:30:14 +00:00
YUKAI HUNG
4f513d7237 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: Icdc5d87aa5f41ab32fc546d0bd513d505bcebd51
 2021-09-28 07:30:13 +00:00
YUKAI HUNG
36072e86ef Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev 2021-09-28 07:19:59 +00:00
YUKAI HUNG
4a4f13d5b0 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev 2021-09-28 07:12:01 +00:00
PETER LIANG
a507085d09 Merge "Add the max height restriction into the illustration view." into sc-v2-dev am: 65faee72f5 am: 7260fe0330 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809052

Change-Id: Id6051ae6b6e43bd78375beee27eb5982423de400
 2021-09-28 06:13:05 +00:00
PETER LIANG
7260fe0330 Merge "Add the max height restriction into the illustration view." into sc-v2-dev am: 65faee72f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809052

Change-Id: Id9e4ca6f0c53a8924b75c7c31120d9776f9469de
 2021-09-28 05:58:52 +00:00
PETER LIANG
65faee72f5 Merge "Add the max height restriction into the illustration view." into sc-v2-dev 2021-09-28 05:43:21 +00:00
TreeHugger Robot
7ca53ecfcd Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev am: 244e0f536b am: 209210b0b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895171

Change-Id: I708e9829085f23a6a2dd2c0e93d69cec93679be8
 2021-09-28 04:53:15 +00:00
TreeHugger Robot
209210b0b6 Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev am: 244e0f536b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895171

Change-Id: I07b2b389806a8eea5093c8b3bb8035f25cf26789
 2021-09-28 04:38:50 +00:00