Bill Yi
51be62033b
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I66c83548d16ff74f6cda297126d4d3b3d02f47fe
2021-09-27 16:03:01 +00:00
Bill Yi
1c3d6efc94
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: c038db5354
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I5a6ca63c289c024df8fd06bf7ebccfa3e01892d6
2021-09-27 16:03:00 +00:00
Bill Yi
b1c97edfbf
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I7d579952b68e25e8aa7562102170168adf184cdc
2021-09-27 16:02:26 +00:00
Bill Yi
9ffcace688
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: 3732defccb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I83e1d3d3998f7bfc391d81b2449227a6b4504cfd
2021-09-27 16:02:25 +00:00
TreeHugger Robot
3d98b16f9f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours am: 16ab663f53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: I47e95d1208ad76d7d127d59cae65f90c37ad0b21
2021-09-27 16:01:42 +00:00
Bill Yi
cd6592d352
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours am: f78bbdeedc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I02c98c805beba0b38cc36ca686ad9da5004d109b
2021-09-27 16:01:01 +00:00
TreeHugger Robot
fba9d96a43
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
am: 6a9d8bc5bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168
Change-Id: Iaf4cdb97bda02f79664e76dff13191a71300c885
2021-09-27 16:00:50 +00:00
Curtis Belmonte
402512fd6c
[automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3
-s ours am: d390efcddf
-s ours
...
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332
Change-Id: Id15b61aaaeab6f7e5ec0a1131eb91a1dec7767df
2021-09-27 16:00:19 +00:00
TreeHugger Robot
d508fbf43b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898517
Change-Id: I5d59e69443e7d1424fbfb1b46eccc4ae9f373243
2021-09-27 15:59:15 +00:00
TreeHugger Robot
d263a1305d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898514
Change-Id: Id1f0095a947ea075fc6d5a88a57a57ef11962d5d
2021-09-27 15:57:26 +00:00
TreeHugger Robot
6a9d8bc5bc
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168
Change-Id: I5c6bd25d10088435a5f41010d825c5baf172a778
2021-09-27 15:49:47 +00:00
Curtis Belmonte
d390efcddf
[automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3
-s ours
...
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332
Change-Id: I1c8aa676a3f9baff6e314bdd70c6f7bd26466e4c
2021-09-27 15:43:43 +00:00
Bill Yi
c7b20e5be7
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
am: 397b66c992
am: 863e1394dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I6585df5d64cab60d7e2a25c0313ff61a222096f8
2021-09-27 15:21:34 +00:00
Bill Yi
39677767e3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: fe3544e435
-s ours am: 58cf11a21a
-s ours am: af535cc8cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I61e40ec8e4108c179ff8544c08380ca23d54e8e9
2021-09-27 15:21:33 +00:00
Bill Yi
0a6c573391
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: 7245d9f02a
-s ours am: 797ea65d28
-s ours am: 50206b8664
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I084cd8986e913e04357db210700f5c6b7d23bbfb
2021-09-27 15:20:38 +00:00
Bill Yi
863e1394dd
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
am: 397b66c992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I655e66620f4062b04eb217b73171e541de7828de
2021-09-27 15:07:04 +00:00
Bill Yi
af535cc8cf
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: fe3544e435
-s ours am: 58cf11a21a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I33f58c803e225c4de893091ad13bef78c3e487f8
2021-09-27 15:07:04 +00:00
Bill Yi
50206b8664
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: 7245d9f02a
-s ours am: 797ea65d28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I234e5e7e6064ae8f9ac08d4acc378112e2aed823
2021-09-27 15:05:59 +00:00
Bill Yi
397b66c992
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I038f654fef5583fcd295d5c9aa263a73b4bf1a40
2021-09-27 14:50:31 +00:00
Bill Yi
58cf11a21a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: fe3544e435
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: Ia888ce7e89c8e65e0915496c446d54e1ce07abc0
2021-09-27 14:50:29 +00:00
Bill Yi
797ea65d28
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: 7245d9f02a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I8ba326f60d727b1941260042ef9c2dbe45bc3fe7
2021-09-27 14:50:00 +00:00
Bill Yi
082d6f465e
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-mainline-prod am: f291d21a60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I49c5f55c013edcaf55ef8c3a3f0cce4914d110d5
2021-09-27 14:40:54 +00:00
Bill Yi
7378aac868
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
2021-09-27 14:33:16 +00:00
Bill Yi
f291d21a60
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
2021-09-27 14:33:16 +00:00
Bill Yi
88e6492f12
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
2p: f40f1d1d7d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
2021-09-27 14:33:16 +00:00
Bill Yi
622e9f3aac
Merge changes from topic "presubmit-am-0a687c09fd19447bb5c186f32a2cd11e"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f1ef62bc4a
Import translations. DO NOT MERGE ANYWHERE
2021-09-27 14:30:36 +00:00
ykhung
68421b5df8
[S-QPR1] add package name for enable/disable app user actions metric
...
add package name into the metric per @wangkelly request to analyze users behavior in the battery setting relative CUJ:
go/battery-setting-enums
go/battery-setting-metrics-dev
Bug: 199807285
Test: make SettingsRoboTests
Change-Id: Ica6da59b933b0dcff940215d4e537a670bac52cb
(cherry picked from commit e12712dd1d
)
2021-09-27 12:59:55 +00:00
Arc Wang
8524de9911
Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev am: d749c4eadf
am: 0f9f5056d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919134
Change-Id: I65294f9d595eaca88107db85b272468964cbf77f
2021-09-27 12:14:33 +00:00
Arc Wang
0f9f5056d0
Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev am: d749c4eadf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919134
Change-Id: Ibd8b3c84ecdcc881e9c9e92f75792cba02f41dcc
2021-09-27 12:00:18 +00:00
Arc Wang
d749c4eadf
Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev
2021-09-27 11:50:40 +00:00
ykhung
22e637bfc9
[S-QPR1] protect gettinng battery stats from DeadSystemException
...
In some corner cases, we will receive the DeadSystemException from
BatteryStatService when invoking getBatteryUsageStats() method, since it
will encounter the binder transaction too large error. Before the root
cause is resolved by the BatteryStatService team, we have to add
workaround protection in the app side to avoid Setting is crashed.
Bug: 191237968
Bug: 198084535
Test: make SettingsRoboTests
Change-Id: I783479241bac83b4afc8ced3073e1b1db302c48c
Merged-In: I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47
2021-09-27 09:57:41 +00:00
Arc Wang
3e8164647c
[Large screen] Show full screen CreateShortcutActivity
...
Show full screen for CreateShortcutActivity because
-Launcher startActivityForResult for Intent.ACTION_CREATE_SHORTCUT and
activity stack starts from launcher, CreateShortcutActivity will not
follows SplitPaitRule registered by Settings.
- There is no CreateShortcutActivity entry point from Settings app UI.
Bug: 200916507
Test: manual
Launcher menu -> Widgets -> Settings -> select an item.
Observe if it goes back go launcher.
Change-Id: I437ff9b82d5a4548e10aed7bd083fd01352433f4
2021-09-27 17:44:41 +08:00
Bill Yi
bb1fa59ee0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6
-s ours am: 1935982f0c
-s ours am: b4c0945299
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915622
Change-Id: I79b3a93c6d75d0c71b8661652e1105f2453836a9
2021-09-27 07:26:25 +00:00
TreeHugger Robot
ac36574156
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 33e5bdd34d
-s ours am: e5f93b6af4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915623
Change-Id: I8246233523b2ca77c1b31e8db27a4d5db3c689e6
2021-09-27 07:24:55 +00:00
Bill Yi
b4c0945299
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6
-s ours am: 1935982f0c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915622
Change-Id: Ie60f0581a87d67d79eed2d953f14b0b2f35a2f38
2021-09-27 07:24:53 +00:00
Peiyong Lin
c7e5181619
Merge "Update string to avoid using etc."
2021-09-27 07:10:57 +00:00
TreeHugger Robot
e5f93b6af4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 33e5bdd34d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915623
Change-Id: Ia9174c81e21e280ca54d923ac7512511eb1a6828
2021-09-27 07:05:30 +00:00
Bill Yi
1935982f0c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915622
Change-Id: I0cefaafdf0478a4c4d6cb92ace0e14c2d5cea3b2
2021-09-27 07:05:26 +00:00
TreeHugger Robot
33e5bdd34d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-27 06:52:41 +00:00
TreeHugger Robot
c8e9493a06
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-09-27 06:47:04 +00:00
Yanting Yang
e2550c777a
Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev am: 2129ea5947
am: 8269df988f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895167
Change-Id: Ifb661042222a49700a0eed8007f207cf1202647b
2021-09-27 03:24:06 +00:00
jasonwshsu
f03f6e2326
[automerger skipped] Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest am: 77dfb35922
am: 91a147ff71
-s ours
...
am skip reason: Merged-In I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39 with SHA-1 2d3894a148
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915645
Change-Id: I04a7ef4a42b3c23d16e51084bc0fce8ee993810c
2021-09-27 03:24:01 +00:00
Yanting Yang
8269df988f
Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev am: 2129ea5947
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895167
Change-Id: I70e9abf03d0985c7e327692a96b66fc731978b1f
2021-09-27 03:09:48 +00:00
jasonwshsu
91a147ff71
Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest am: 77dfb35922
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915645
Change-Id: Ibf00f3e9d071fe210f2b2f4aacd02c762f1121a9
2021-09-27 03:09:41 +00:00
Yanting Yang
2129ea5947
Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev
2021-09-27 03:04:02 +00:00
jasonwshsu
77dfb35922
Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest
...
Root Cause: The lifecycle for
AccessibilityShortcutPreferenceFragmentTest did not be called correctly.
Solution:
* Call onAttach() before onCreate() to set some configs correctly, e.g.
FeatureFactory.
* Use ShadowFragment.class that we usually do in accessibility
tests.
Fix: 200906425
Fix: 201020915
Test: atest AccessibilityShortcutPreferenceFragmentTest
Change-Id: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
Merged-In: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
2021-09-27 02:04:43 +00:00
Daniel Solomon
5a02e48902
Update BrightnessInfo constructor usage
...
Bug: 200851199
Test: atest DisplayModeDirectorTest BrightnessLevelPreferenceControllerTest
Change-Id: I37593443b3d7eb314f8c4970711e4d4d6f39c6ea
2021-09-26 16:14:09 -07:00
Bill Yi
b28191e3c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7b2a0c1b711f75dfd5dd0f89cbf0cd5776bc5cc
2021-09-26 04:42:16 +00:00
Bill Yi
49ce6473d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7c1879f0724a02c587b898e68ef9161871561431
2021-09-26 04:38:29 +00:00
Bill Yi
d4fd4832c3
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
2p: f40f1d1d7d
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: Ibff510226484db953450d86fc4e09d9a577ac7aa
2021-09-26 04:35:11 +00:00