TreeHugger Robot
300534f327
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3988c628f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846097
Change-Id: Icec8066206f26fcf53ec7a9cb68c36fd11f4dfed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 22:07:49 +00:00
Bill Yi
e2b79d8fcc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5c5fb43da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846097
Change-Id: I93b51be84ce0fa9bac390f000f251e576e3c2d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 22:07:28 +00:00
Bill Yi
e192853dd4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aca33157e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846096
Change-Id: I50d45da7db6f6c3e0691efea1dcaa0211568de45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 22:07:09 +00:00
Bonian Chen
6a3e40e87e
[Settings] Adjust string resource for ID
...
Bug: 260806431
Test: build pass
Change-Id: I49a7fe8b504651446be0c0ebdbaa48d764473372
2023-01-03 15:34:44 +00:00
Yasin Kilicdere
85379e9452
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
am: 2ecf96a422
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 12:53:48 +00:00
Yasin Kilicdere
15a89a60ac
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev
2023-01-03 12:18:58 +00:00
Shen Lin
bdcfaceeb2
Fix NPE in BluetoothPairingController when comparing BluetoothClass
...
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
2023-01-03 06:33:51 +00:00
Chaohui Wang
36903136af
Fix AppDataUsagePreferenceTest#whenHasDataUsage
...
Fix: 264141691
Test: Unit test
Change-Id: I208f6f8f04d0ed59e31b795f5c90a64e0f76cfa3
2023-01-03 11:47:25 +08:00
Chaohui Wang
7430578af1
Merge "Add SpaAppBridgeActivity for application usage"
2023-01-03 03:06:18 +00:00
Betty Chang
a50fb6ec33
Merge "To check the bond state when get the connection state"
2023-01-03 02:20:03 +00:00
Grace Cheng
04c630ca8a
Adding product string variants on choose lock page
...
Adding product string variants on choose lock page
Test: (manual) observe fixed string on tablet on choose lock page
Fixes: 250807976
Change-Id: I4a0ab0a019708f3e0d81602967b187f6a7089dc5
2023-01-01 21:26:52 +00:00
TreeHugger Robot
20d80e79da
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-31 06:37:56 +00:00
TreeHugger Robot
3988c628f1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-31 06:37:56 +00:00
TreeHugger Robot
2451afc0df
Merge "Refine TetherSettings to avoid activity leaks"
2022-12-30 16:41:19 +00:00
Vania Januar
3dcceea28f
Merge "Set title for Bluetooth Details page to "Stylus" for styluses."
2022-12-30 09:32:43 +00:00
TreeHugger Robot
e37f265f31
Merge "Remove unused logic"
2022-12-30 05:21:01 +00:00
Bill Yi
5baeaab354
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If04ffff758b1c88b3b7576858f8760893ee04bcf
2022-12-29 20:55:43 -08:00
Bill Yi
c5c5fb43da
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaabefc3fcd1e7c28c769f416ad25a32c37beaac0
2022-12-29 20:54:14 -08:00
Bill Yi
aca33157e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia82d4eaed61ad8144ea278b4b64f6391cb044fb3
2022-12-29 20:51:10 -08:00
Tom Hsu
94cd62ff00
Merge "[Regional Preference] Add each option entry"
2022-12-30 03:20:13 +00:00
XingHai Lu
df1fc7e0fa
Merge "Cleanup plurals format Change <one> to <1> in string res file Test: Update, existing tests still pass bug: 199230342"
2022-12-30 02:44:25 +00:00
Milton Wu
160661dc6d
Launch settings for clicking fingerprint unlock
...
Launch FingerprintSettings directly when user clicks "Fingerprint
Unlock". Let Fingerprint settings peform confirmLock() or chooseLock().
And to have smoothly animation, instead of generating challenge in
FingerprintSettings::onActivityResult(), challenge is generated in next
visible activity, and pass it back through next activity result.
Bug: 197717071
Test: atest GatekeeperPasswordProviderTest CredentialModelTest
Test: atest AutoCredentialViewModelTest FingerprintStatusUtilsTest
Test: RunSettingsRoboTests2 FingerprintEnrollIntroductionTest
Test: Manually test fingerprint enroll in settings or suw
Change-Id: Ie27c3c493ea475f6b53cb6bb3f2d45d555f47cb3
2022-12-30 10:01:06 +08:00
TreeHugger Robot
ca0ff60d63
Merge "Fix the end-icon missing issue for Wi-Fi networks"
2022-12-30 01:29:29 +00:00
Weng Su
fbe02cd543
Fix the end-icon missing issue for Wi-Fi networks
...
- Because WifiEntryPreference needs to support policy transparency, the inherited class is changed from Preference to RestrictedPreference.
- The RestrictedPreference will hides the end icon as default, causing this issue to happen.
- Override the getSecondTargetResId() function with necessary resource id to avoid the end-icon being hidden.
- Remove the redundant setWidgetLayoutResource, because it will be initialized in the extended class.
Bug: 262456749
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
Change-Id: Ie3d3a649d3137dc705d7887c8e74592437d9ce61
2022-12-30 05:06:54 +08:00
Vania Januar
8811c177ea
Merge "Pass CachedBluetoothDevice into StylusDevicesController."
2022-12-29 14:55:56 +00:00
TreeHugger Robot
6d8127677e
Merge "Fix overlapping issue in Security certificate page"
2022-12-29 14:45:23 +00:00
tom hsu
504a5dda43
[Regional Preference] Add each option entry
...
- Add a entry in langauge and input page
- Add new page for the options of Temperature unit, calendar type,
first day of week, and numbering system.
Bug: b/246929960
Test: atest pass
Test: Manual test pass
Change-Id: I69377fe9cd6dcd7a27c933a8dc98483df3da7665
2022-12-29 21:54:21 +08:00
Vania Januar
b837d57b02
Set title for Bluetooth Details page to "Stylus" for styluses.
...
Bug: 254835745
Test: BluetoothDeviceDetailsFragmentTest
Change-Id: I725877b0bcf44fa7be805e16fb2d695c9d6074dc
2022-12-29 12:31:59 +00:00
Bonian Chen
2c84a3ba8c
Merge "[Settings] Remove EID from SimStatusDialog"
2022-12-29 12:31:49 +00:00
Vania Januar
57822a67a8
Pass CachedBluetoothDevice into StylusDevicesController.
...
Styluses can now be identified using the newly added DEVICE_TYPE_STYLUS
metadata.
Bug: 251200056
Test: StylusDevicesControllerTest
Change-Id: Ie89f6419cd16ed97299944b35497c6b2ee764dab
2022-12-29 12:31:31 +00:00
ykhung
553baca4ce
Remove EarlyWarningTip and move the logic into LowBatteryTip
...
Fix: 263835342
Test: presubmit
Change-Id: I256cd6f364979046ee87524751c3fe137a0524c2
2022-12-29 15:53:57 +08:00
Ale Nijamkin
58c3318e19
[automerger skipped] Merge "Renames customization content provider (2/7)." into tm-qpr-dev am: 53b342a81a
am: 3802fbf7a2
-s ours
...
am skip reason: Merged-In Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2 with SHA-1 6f77562412
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20824496
Change-Id: I1221de6107a083e55cea75a7f0aaf57db4bdf25f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-28 19:17:20 +00:00
Ale Nijamkin
3802fbf7a2
Merge "Renames customization content provider (2/7)." into tm-qpr-dev am: 53b342a81a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20824496
Change-Id: I165e83754f1d6cfe7cf144c12ed5ac902dc01e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-28 18:37:37 +00:00
Ale Nijamkin
53b342a81a
Merge "Renames customization content provider (2/7)." into tm-qpr-dev
2022-12-28 17:42:20 +00:00
Himanshu Gupta
cf33ba2e04
Merge "Adding "Delete all App Clones" option on Cloned Apps page."
2022-12-28 16:51:37 +00:00
PETER LIANG
f18986cfe9
Merge "Fix that the preview should keep the same layer when switching the screen on/off."
2022-12-28 16:16:04 +00:00
YK Hung
ea0b1a99b0
Merge "Remove the legacy EarlyWarning tip mechanism to improve performance"
2022-12-28 16:03:14 +00:00
PETER LIANG
2b347d7f2d
Merge "Fix overlapping icons on display size page."
2022-12-28 12:36:35 +00:00
Weng Su
29846984e7
Refine TetherSettings to avoid activity leaks
...
- Get system service by application context instead of fragment context to avoid the context being occupied
- Use the application main executor instead of creating new executor locally to avoid the executor being occupied
Bug: 246531382
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
atest -c TetheringHelperTest
Change-Id: I0de5e9c2bedfc8a224b3f8306224542212c9fcf5
2022-12-28 07:45:47 +00:00
Kuan Wang
1ce97c8ebe
Generate app and device screen-on time data and return back to UI for
...
rendering.
Test: make RunSettingsRoboTests + manually
Bug: 260964903
Change-Id: I2fd69b4686cc2e1413ad0eb43c07b6164e411411
2022-12-28 07:40:39 +00:00
ykhung
4a470d87dc
Remove the legacy EarlyWarning tip mechanism to improve performance
...
Fix: 263835342
Test: presubmit
Change-Id: I0c3f61a21874c70b49cdeb73bbdc285ef8c4a35f
2022-12-28 15:33:19 +08:00
TreeHugger Robot
a3df41cacc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c9dead089
-s ours am: 420afe232b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20815100
Change-Id: I6aeb3308ecad7b260354f75212bb2e4b92a50746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-28 07:07:32 +00:00
Bill Yi
75c8494dd2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33f9bd645a
-s ours am: 6632af6cda
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20815100
Change-Id: If7a5767e81dddb02a531a24222e1ee279b89968b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-28 07:07:25 +00:00
TreeHugger Robot
1dc752d834
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-28 06:36:24 +00:00
TreeHugger Robot
ba8fa1bc24
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-28 06:36:24 +00:00
TreeHugger Robot
efb8b27bf6
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-28 06:36:24 +00:00
TreeHugger Robot
5108602446
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-28 06:36:24 +00:00
TreeHugger Robot
420afe232b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c9dead089
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20815100
Change-Id: Ieacff4cba7da4c415de0dd2cc1bd701b8076d4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-28 06:16:08 +00:00
Bill Yi
6632af6cda
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33f9bd645a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20815100
Change-Id: I1327e057945f138c394950771e7664af707298b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-28 06:15:46 +00:00