TreeHugger Robot
da8e9c1108
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-02 06:34:33 +00:00
Bill Yi
41533a64d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a5eb92a2e472ba7faca95791c4b748f71c20a58
2021-10-02 04:46:24 +00:00
Bill Yi
853fdb2f22
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: If00f802350f9a2769fb8cc2d992c0f7b42f09f43
2021-10-02 04:43:05 +00:00
Bill Yi
ae858a0237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
2021-10-02 04:42:52 +00:00
TreeHugger Robot
468bad73d7
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev
2021-10-01 23:26:52 +00:00
TreeHugger Robot
e750fb7528
Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev
2021-10-01 18:15:58 +00:00
Sunny Shao
f25e8aa74c
Add more info on the dialog of AllowBindAppWidgetActivity
...
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.
Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
Merged-In: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
(cherry picked from commit 1564ef5ca1
)
2021-10-01 05:45:49 +00:00
TreeHugger Robot
cddd334ee6
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ia84dd48edcae481fb006b582e9e5c2274d2e86e7
2021-09-30 19:06:45 +00:00
TreeHugger Robot
a2e975064e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev
2021-09-30 18:51:47 +00:00
TreeHugger Robot
7ba545d992
Merge "Fix USB tether option" into sc-qpr1-dev
2021-09-30 12:06:41 +00:00
Bill Yi
bdbca48e77
Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:08:57 +00:00
TreeHugger Robot
83423b2dff
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-29 08:04:35 +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
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
3769790fed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5cf6feb89d6b5418866abcb32e14d00eaaae73ef
2021-09-28 09:01:22 +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
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
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
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
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
fe3544e435
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: Ib81043858abd402fcc9e4b0cdfa856ca2a26b3ba
2021-09-26 04:35:06 +00:00
Bill Yi
92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I116288a1e6ca78f8cd87f40b7a83de262b7b4449
2021-09-26 04:34:53 +00:00
Julia Reynolds
1aff9c726a
Always return the same result code in access screens
...
Regardless if the target package exists or not.
Test: Launch dnd and NLS screen with valid and invalid
packages; ensure the result code is the same for both
Bug: 195412179
Change-Id: I1bacd54c2971afb3733ca2f1462bcaabaada300b
2021-09-24 18:05:27 +00:00
Bill Yi
7e253fafe9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-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: I2820410fc0de20dd6ec3b8fe2bb92dc593b6b3e7
2021-09-24 17:27:21 +00:00
Bill Yi
ee7f088a94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-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: Id9ce6f1b5106c79de410fa563465ee026c1a17f2
2021-09-24 17:26:39 +00:00
Bill Yi
d43653e80d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-24 17:13:34 +00:00
Bill Yi
1b857d20ac
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
ffa2c65c22
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-24 17:10:56 +00:00
Bill Yi
6553465417
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
TreeHugger Robot
16ab663f53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-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: Ic29e3bfc8ee0d8837ea923f3a80f333a7578f9af
2021-09-24 17:01:46 +00:00
Bill Yi
f78bbdeedc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-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: I7965d6f1a57b2e26c13d88d00c81d051f197ac1b
2021-09-24 17:01:35 +00:00
TreeHugger Robot
85214e918e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-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: I86e538594b008a280a542665306978afaba1e771
2021-09-24 16:45:20 +00:00
Bill Yi
78abb83343
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-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: I37b3fc803bb1b033f24467dc54f43a8d7e1f4cb1
2021-09-24 16:44:26 +00:00
TreeHugger Robot
de59a250f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-24 16:32:45 +00:00
TreeHugger Robot
f337947e27
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-24 16:32:43 +00:00
TreeHugger Robot
416206347b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-24 16:32:30 +00:00
TreeHugger Robot
cc1cc9a5f7
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev
2021-09-24 05:44:36 +00:00
Bill Yi
69f3bf31bd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie4986612ba1ce3d84272be69628dcbea8cb85b66
2021-09-23 18:09:03 +00:00
Bill Yi
3732defccb
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I125eea2083b7ea7ef9780b97d6d215ec9ea943e0
2021-09-23 18:05:42 +00:00
Bill Yi
2ac6a59163
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0697c6a68834ab937fd502189296b32de96d917c
2021-09-23 18:05:26 +00:00
Bill Yi
c6385601c3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4806e38ef45bc012fb2f9c1f53f999530b48eb46
2021-09-23 17:55:55 +00:00
Bill Yi
c038db5354
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I55159fbb85866801b28601380ccc9eb6658cbd06
2021-09-23 17:54:54 +00:00
Bill Yi
464f75c26f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f6ce2ff37cea9e6f452bebb92b9cb78b844f3aa
2021-09-23 17:54:22 +00:00
Bill Yi
20df40e783
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia87ff5a7993ad94c6b9e910380d5b758dfb6363e
2021-09-23 17:49:59 +00:00
Bill Yi
6d56b2dce8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id60fd628884560576a270ab93f49a235cfc8b932
2021-09-23 17:46:38 +00:00
Alex Johnston
685cacb540
Fix USB tether option
...
* USB tether option will be grayed out before
USB cable is plugged in.
Bug: 192225597
Test: manual testing
Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
2021-09-23 16:05:29 +00:00
Tsung-Mao Fang
b57265fa31
Revert "Move Automatic System Updates from Developer Options to ..."
...
Revert submission 15552651-cherrypick-automatic-system-update-n9jr24y6ba
Reason for revert: Legal team decided to have this entry in GMS, so we can move this setting item back.
Reverted Changes:
Iaea3e11d9:Move Automatic System Updates from Developer Optio...
I077607a6a:Move Automatic System Updates from Developer Optio...
Change-Id: If000388f2dd0f9e3e06a29dcbdd362181d1bfd47
Bug: 196297425
2021-09-23 09:26:58 +00:00
Curtis Belmonte
491ef413c3
Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev
2021-09-22 17:52:47 +00:00
TreeHugger Robot
85d20f5957
Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev
2021-09-22 09:08:25 +00:00