Commit Graph

117291 Commits

Author SHA1 Message Date
YK Hung
2cdc7409b5 Merge "Verify and reset invalid scheduled battery level in the booting stage" 2022-11-10 10:23:04 +00:00
Zaiyue Xue
f3f4eca6e8 [automerger skipped] Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev am: aee2d55bfa am: 240ff56875 -s ours
am skip reason: Merged-In Ib316e9fecac60f388e2b1810de9a65c540c52358 with SHA-1 1cf801e793 is already in history

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

Change-Id: I0c683c4b8b25a938bbec9dd6ebc3d9cdc93ed5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 10:03:36 +00:00
Zaiyue Xue
240ff56875 Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev am: aee2d55bfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410009

Change-Id: I89a8e622134524f701e440a9bd3e2cf0c84fae8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 09:33:08 +00:00
Zaiyue Xue
aee2d55bfa Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev 2022-11-10 08:52:42 +00:00
ykhung
4c0de2685a Verify and reset invalid scheduled battery level in the booting stage
The minimum scheduled battery level is changed from 5% to 10% in T, if
users upgrade the device from S to T with invalid level value in
the Settings.Global, we have to force reset it into the new minimum
battery level value.

Bug: 258243197
Test: make RunSettingsRoboTests
Change-Id: I89003120aaebcff78d4bf3f7ae8b54e97adae3c8
2022-11-10 16:38:18 +08:00
Kweku Adams
d7194ad75d Set package name.
The system expects an actual package name in the ApplicationInfo object
so make sure to set it in the test object.

Bug: 258472566
Test: atest AppButtonsTest
Change-Id: I3bee07a6a395c9962af57f934cf3ca86eb60354a
2022-11-09 20:57:23 +00:00
Diya Bera
7c056d00ac Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev am: 9cb05bc57b am: 0eaab46d92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20356992

Change-Id: Ic1ddb65b41ffe2676f8b3e6b19fa00fefad5d229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 18:22:18 +00:00
Diya Bera
0eaab46d92 Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev am: 9cb05bc57b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20356992

Change-Id: I9166287d83b501b5510ce451ba584f940d8809bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 17:50:16 +00:00
Diya Bera
9cb05bc57b Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev 2022-11-09 17:25:35 +00:00
Oli Thompson
c30c7f5d58 Merge "Fix forgot password layout text alignment and change theme to show correct text colour in night mode Test: manual test Fixes: b/206761685" 2022-11-09 14:55:41 +00:00
Chaohui Wang
3e5c32df67 Clean up unused methods from AppStateAppOpsBridge
Bug: 258256121
Test: Manually with Settings
Change-Id: I88092cdf6135af784ec90bf0112526ae18557c94
2022-11-09 16:36:35 +08:00
Treehugger Robot
ac06d8d55f Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c am: 170a632a66 am: f97d2d6f1d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

Change-Id: I47c88d1a4b4455de37c628be44090e5b14c9651a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 06:40:37 +00:00
Bill Yi
f32aa79e04 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-09 06:28:29 +00:00
TreeHugger Robot
e9784d14c8 Merge "Add description for app languages page" 2022-11-09 06:18:13 +00:00
Treehugger Robot
f97d2d6f1d Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c am: 170a632a66
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

Change-Id: Ibae90d867f896f4d4c611f5b2390dc0d5362a9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 06:08:04 +00:00
Treehugger Robot
170a632a66 Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

Change-Id: Iaa6e62832270441010d07fcc23f01149229f6e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 05:39:03 +00:00
Treehugger Robot
48c386e54c Merge "Align main thread checking by calling ThreadUtils" 2022-11-09 05:13:53 +00:00
Chaohui Wang
cac9f49c0f Merge "Navigate more App List to SPA" 2022-11-09 04:54:34 +00:00
Mill Chen
650fbce5d8 Add description for app languages page
Bug: 236346018
Test: manual test with Settings app
Change-Id: I011957a321ad8c26743e72cc7ce825d06dab9167
2022-11-09 12:47:36 +08:00
Shen Lin
ce0e8b9a4b Align main thread checking by calling ThreadUtils
Since ThreadUtils encapsules method to ensure main thread, it is
suggested to call this method rather than maintaining our copy.

Bug: 258270052
Test: atest and manual.
Change-Id: I4c5fcdd6e5bcc7d1d08f526eedb3aa123926d8a1
2022-11-09 11:43:03 +08:00
Zaiyue Xue
866203a3b8 Fix b/257404630 Inconsistent strings in battery chart
Change all the "from last full charge" to "since last full charge".

Bug: 257404630
Fix: 257404630
Test: presubmit
Change-Id: Ib316e9fecac60f388e2b1810de9a65c540c52358
Merged-In: Ib316e9fecac60f388e2b1810de9a65c540c52358
2022-11-09 02:39:22 +00:00
Kuan Wang
d81a6ceefd Remove unnecessary check canScheduleExactAlarms() as Settings always
has the permission.

Test: make RunSettingsRoboTests
Bug: 256123455
Change-Id: I5089494164581465da9533671fc414c7bee1196f
2022-11-09 01:25:10 +00:00
Diya Bera
a26c2d6b37 Fixes crash in face enrollment during set up in work mode
Copying extras in face intent to avoid incorrect information later in the lifecycle.

Fixes: 247049655
Test: Manual
Change-Id: I4c394a2f7b9e80d6ddc6ef385c3ab11ecf56387b
2022-11-08 23:35:05 +00:00
Bill Yi
fe26b89394 Merge changes from topic "tc_change_22110621_19"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0075b291c2
  Import translations. DO NOT MERGE ANYWHERE
2022-11-08 23:24:57 +00:00
Hao Dong
1fc440a8b5 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." 2022-11-08 20:40:10 +00:00
Oli Thompson
cff34af3d4 Fix forgot password layout text alignment and change theme to show
correct text colour in night mode
Test: manual test
Fixes: b/206761685

Change-Id: Idccf40357a6b5f33ece89bc2772fa6ca51e4596a
2022-11-08 13:41:53 +00:00
TreeHugger Robot
9a0bd369d3 Merge "Fix b/257404630 Inconsistent strings in battery chart" 2022-11-08 11:14:41 +00:00
TreeHugger Robot
612e6c1ddd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b93416b26d -s ours am: 4f30faa91c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I471d71a1e704e8cf8ef552180b16f79455ce28f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:35:27 +00:00
Bill Yi
40f3de5c51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef39119269 -s ours am: 9e26f13061 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f67ac3b78c93c8117efd22fbfeb80cd15454c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:35:15 +00:00
TreeHugger Robot
4f30faa91c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b93416b26d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad18fe9860c68c39e3590c3e33b7dbd2b13bd60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:10:13 +00:00
Bill Yi
9e26f13061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef39119269 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6edfc370be502fd83a20e6f8a5be5b024f81d85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:09:52 +00:00
TreeHugger Robot
b93416b26d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-08 09:30:47 +00:00
Jason Chiu
7fd3621809 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225ac3 am: 2cbced55a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450

Change-Id: Ib44c08584f56e992d2caa26ee8018f6724993390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 05:34:41 +00:00
Jason Chiu
2cbced55a4 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225ac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450

Change-Id: I848120e8276098a0df41c2c1d8cea68682c21e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 05:02:35 +00:00
TreeHugger Robot
292593f515 Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev am: a6e8ddda16 am: 6d16483eee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20383946

Change-Id: I48e4b0bf19fd97704911211a4717474903fdf29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 04:37:35 +00:00
Jason Chiu
b9b1225ac3 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev 2022-11-08 04:34:19 +00:00
TreeHugger Robot
6d16483eee Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev am: a6e8ddda16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20383946

Change-Id: I381b2accad394334310db3b8b384fa4a114991a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 04:05:35 +00:00
TreeHugger Robot
26b806629d Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477 am: fec63bdb5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860

Change-Id: I6630576b731ff2c589b01520be45f55cf3f0e275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 03:53:22 +00:00
TreeHugger Robot
a6e8ddda16 Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev 2022-11-08 03:34:11 +00:00
TreeHugger Robot
fec63bdb5b Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860

Change-Id: I68469b235bf57c254cfc9d5aaa8580e4f1abd141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 03:20:12 +00:00
Chaohui Wang
a2c045a717 Navigate more App List to SPA
Guarded by feature flag SETTINGS_ENABLE_SPA, default false.
When flag enabled, will navigate to the new App List pages
which are implemented by SPA.

Bug: 235727273
Test: Manual test with Settings app
Change-Id: I1905a92dd19f04c46476ce3157897ea609e590df
2022-11-08 10:56:54 +08:00
Zaiyue Xue
1cf801e793 Fix b/257404630 Inconsistent strings in battery chart
Change all the "from last full charge" to "since last full charge".

Bug: 257404630
Fix: 257404630
Test: presubmit
Change-Id: Ib316e9fecac60f388e2b1810de9a65c540c52358
2022-11-08 10:43:35 +08:00
TreeHugger Robot
19278b9477 Merge "Clean bluetooth code" into tm-qpr-dev 2022-11-08 02:37:30 +00:00
Jason Chiu
fb95451369 Reserve the icon space to avoid preference padding change
If the injection icon is to be retrieved from a provider, the preset
transparent drawable is a 1x1 icon, which may cause the preference
padding change before and after the injection icon reloading.

Bug: 253471066
Test: robotest, visual
Change-Id: Ie88f69bb047a64a6a0ee30c060d8cbb8fe27b3d7
2022-11-07 10:11:20 +00:00
Tetiana Meronyk
61d661feb9 Merge "Disable toggle on managed device with "Disallow add user" or "Disallow switch user"" 2022-11-07 09:27:30 +00:00
TreeHugger Robot
e09381cf36 Merge "Remove Fix connectivity menu for guest" 2022-11-07 08:41:30 +00:00
Bill Yi
c92068ed35 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0075b291c2
Blank merge reason: commit message contains skip directive

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

Change-Id: I084bac1a566ce26b3eae3eb2c4051106dff2fd1f
2022-11-07 06:03:09 +00:00
Tsung-Mao Fang
70b8bd92c9 Fix NPE crash in TextToSpeechSettings
Recyclerview's getItemAnimator() is nullable so we need a null check.

Bug: 254330134
Test: Manual
Change-Id: Iba5b0d68740c430fd1143d38ccf344afef486784
Merged-In: fa6a8e9767
2022-11-07 05:43:40 +00:00
Bonian Chen
4cff396b56 Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev am: af96b1ea7a am: 59969d6aab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269273

Change-Id: I7aee58dcd1b7276c9b37e57f102c575655d5fcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:33 +00:00
Bonian Chen
bf669d2c89 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev am: 15f0cd6428 am: 16b35935c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269272

Change-Id: I2f0026a350034570a3f129ebb26196f4ae88ffe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:31 +00:00