Jay Aliomer
a759432bac
Merge "Use ColorMatrixColorFilter in batterymeterview" into rvc-qpr-dev
2020-11-03 19:40:22 +00:00
Chloris Kuo
2251b5f894
Merge "Add flag to reset notification channel importance" am: e9d524ffc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12901702
Change-Id: I035d6ccac125f745f1e1e9234639b229ea2ad7c1
2020-11-03 14:09:32 +00:00
Chloris Kuo
e9d524ffc6
Merge "Add flag to reset notification channel importance"
2020-11-03 14:07:45 +00:00
TreeHugger Robot
af7ad618cf
Merge "Add missing PI flag" am: c988aa848b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12968171
Change-Id: I268c8f9b6ff75135cfd82b0de92faed731bd0a9a
2020-11-03 12:57:07 +00:00
TreeHugger Robot
c988aa848b
Merge "Add missing PI flag"
2020-11-03 12:25:55 +00:00
Yi-Ling Chuang
ea92f4eb5e
Add the mutability flag to the pendingIntent.
...
Starting Android S, PendingIntent should have a explicit mutability flag
to avoid vulnerability.
Fixes: 172207853
Test: 1. Make AdaptiveSleepSlice available on the homepage and click on it.
2. Play with the volume panel.
Change-Id: I9cd428b17f44f5215d8c06331d12a17f997ca557
2020-11-03 17:44:56 +08:00
Weng Su
ae3ef639d9
Use new strings for Wi-Fi hotspot toggle specific scenario
...
- The SW (Swahili) language is used for a different noun class and is
inappropriate in the context.
- Need to separate different strings for specific situations.
- Use new strings from SettingsLib resource
Bug: 168801172
Bug: 168733667
Test: Manual test
Change-Id: I0e0a688f54ca2ee1b4cd5049c7e0f3ff3112b127
2020-11-03 09:26:40 +00:00
Zoey Chen
179a8b15b3
Merge "[Provider Model] Use new entry xml of Network & Internet" am: af8faaaa4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12938076
Change-Id: Ie4dc684adfcba523851e9481c127a7df8ccd65b8
2020-11-03 07:42:25 +00:00
TreeHugger Robot
02cce1867b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e268d89b26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12972036
Change-Id: I4bd56130754cbc68bce33620f70b36276b72995b
2020-11-03 07:41:57 +00:00
Zoey Chen
af8faaaa4b
Merge "[Provider Model] Use new entry xml of Network & Internet"
2020-11-03 07:39:25 +00:00
TreeHugger Robot
e268d89b26
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-11-03 07:20:05 +00:00
TreeHugger Robot
0593c5b406
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 69bab04e93
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12971045
Change-Id: I533cdd664339562d211ec9417a39eee3b41e4e29
2020-11-03 07:13:21 +00:00
TreeHugger Robot
69bab04e93
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-11-03 06:31:15 +00:00
Mill Chen
9cbb4fa4e7
Specify explicitly FLAG_IMMUTABLE for PendingIntent
...
The existing pending intent in the BatteryTipUtils has been specified
FLAG_UPDATE_CURRENT. This change is to add explicitly FLAG_IMMUTABLE
to the pending intent.
Fixes: 171506726
Test: build pass, robotest
Change-Id: Ib82ddb45e05b492eef300f2ec064803d768419d0
2020-11-03 13:40:21 +08:00
Zoey Chen
6ca486620a
Merge "[Provider Model] New xml of Calls and SMS" am: d9a4ab246c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12956716
Change-Id: I30be927f82fafb1f33f657e4212ec8ca7646dcbf
2020-11-03 03:48:22 +00:00
Zoey Chen
d9a4ab246c
Merge "[Provider Model] New xml of Calls and SMS"
2020-11-03 03:30:42 +00:00
Hugh Chen
eda6d60e05
Fix crash on "Connection preferences"
...
This CL adds a null check condition to avoid crash for
some device not support PrintManager.
Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763
2020-11-03 11:02:38 +08:00
Treehugger Robot
1d5d35842d
[automerger skipped] Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
am: a8ccdd3ac0
am: 17c1db75da
-s ours am: 0254a6c38d
-s ours
...
am skip reason: Change-Id I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4 with SHA-1 05783b4e6d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: Idf3adb4ab5ad5dbf3517820ae33d15d606672573
2020-11-03 00:13:50 +00:00
Bill Yi
b69426436f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5fb24a892c637b0876f663b222f3d442ae8130c
2020-11-02 16:11:06 -08:00
Treehugger Robot
0254a6c38d
[automerger skipped] Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
am: a8ccdd3ac0
am: 17c1db75da
-s ours
...
am skip reason: Change-Id I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4 with SHA-1 05783b4e6d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: Ib4040c7f631edde3f4bc0279eb0cf36a1092ffaf
2020-11-02 23:56:20 +00:00
Bill Yi
b0e9e824cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia33d3635b7b77afd83fcdf7af436037340666b0f
2020-11-02 15:31:03 -08:00
Treehugger Robot
17c1db75da
Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
am: a8ccdd3ac0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: I61b0e195b971905db8bef4d561749ec2af8f0d27
2020-11-02 23:17:54 +00:00
Treehugger Robot
a8ccdd3ac0
Merge "backup settings: Update OWNERS." am: c7c020688d
am: f977a632b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: Ie5537f257c66639d4b5e534bbca0a1537c3c63e3
2020-11-02 23:03:50 +00:00
Treehugger Robot
f977a632b0
Merge "backup settings: Update OWNERS." am: c7c020688d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480538
Change-Id: I3074b0da6146f9cd5b5eeb4d4644c84c689f590d
2020-11-02 22:48:18 +00:00
Sarah Chin
7f2a6040ef
Update setCdmaRoaming/SubscriptionMode APIs
...
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-02 14:39:55 -08:00
Treehugger Robot
c7c020688d
Merge "backup settings: Update OWNERS."
2020-11-02 21:55:49 +00:00
TreeHugger Robot
c0afadeb18
Merge "backup settings: Update OWNERS." am: 903a211665
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12961195
Change-Id: Idcee0938bca4194f4bd1dbe13971a0d983477d60
2020-11-02 20:45:48 +00:00
TreeHugger Robot
903a211665
Merge "backup settings: Update OWNERS."
2020-11-02 20:08:26 +00:00
Andrei-Valentin Onea
7007c8ca37
Merge "Fix app compat dashboard from settings app" am: 4445b40a65
am: 770e30b1f9
am: 8879952967
am: c3839f4732
am: 9f1c46967e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502
Change-Id: I2143289cc87f9b714f73b6bc39286bb3a04c161b
2020-11-02 16:34:02 +00:00
Andrei-Valentin Onea
9f1c46967e
Merge "Fix app compat dashboard from settings app" am: 4445b40a65
am: 770e30b1f9
am: 8879952967
am: c3839f4732
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502
Change-Id: I5a18fa2db11f9a240aa1d781810fca7717a36da3
2020-11-02 16:20:54 +00:00
Andrei-Valentin Onea
c3839f4732
Merge "Fix app compat dashboard from settings app" am: 4445b40a65
am: 770e30b1f9
am: 8879952967
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502
Change-Id: Ie87c9ff8ae1e76bb667f7201e6314ec995d2e133
2020-11-02 16:06:44 +00:00
Andrei-Valentin Onea
8879952967
Merge "Fix app compat dashboard from settings app" am: 4445b40a65
am: 770e30b1f9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502
Change-Id: I947653ab33790724f2a419297c3fd7649ef4f2fb
2020-11-02 15:37:28 +00:00
Andrei-Valentin Onea
770e30b1f9
Merge "Fix app compat dashboard from settings app" am: 4445b40a65
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502
Change-Id: I4b33afc345e7e3e2a45cb71777843a5aa8eb77df
2020-11-02 15:04:33 +00:00
Andrei-Valentin Onea
4445b40a65
Merge "Fix app compat dashboard from settings app"
2020-11-02 14:52:50 +00:00
Julia Reynolds
3561ff6e4c
Add missing PI flag
...
Test: manual
Fixes: 172214372
Change-Id: Ifaa07e39a7559448854c8d7c89bab227ecb015ba
2020-11-02 09:41:59 -05:00
Zoey Chen
14602e302a
[Provider Model] Use new entry xml of Network & Internet
...
Bug: 171874190
Test: manual
Change-Id: I542ba08c122cb50de37dafd06cfa08dead8e2e0f
2020-11-02 22:28:47 +08:00
Zoey Chen
ee9e7b8642
[Provider Model] New xml of Calls and SMS
...
Bug: 172053880
Test: manual
Change-Id: I4c434e19c9986d9a07f0e96e9aaeaac3a289b9a1
2020-11-02 22:26:25 +08:00
Mariia Sandrikova
2daff16231
Add missed layout_below property for priority section.
...
Fix: 170257825
Test: manual
Change-Id: I09d9fcd2ad8235bc93f4af04bb7b15233d9c32c9
2020-11-02 09:33:05 +00:00
Tobias Thierer
efd5a23b73
backup settings: Update OWNERS.
...
Refer to platform OWNERS + bug component.
Bug: 159055442
Test: Treehugger
Change-Id: I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4
Merged-In: I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4
2020-10-31 01:23:27 +00:00
Tobias Thierer
05783b4e6d
backup settings: Update OWNERS.
...
Refer to platform OWNERS + bug component.
Bug: 159055442
Test: Treehugger
Change-Id: I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4
(cherry picked from commit bfe97711c99ee6654e3cc3c94bc504d3d2f49ec4)
2020-10-31 01:22:46 +00:00
TreeHugger Robot
d82945a317
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4
-s ours am: 081fc9279b
-s ours am: b81eb46545
-s ours am: c7b05589f2
-s ours am: 5f5d754af2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954031
Change-Id: Iace9ffcdfcf8a6c9d302276c3be85c669400e7da
2020-10-30 17:23:42 +00:00
TreeHugger Robot
9a3e43cfec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4
-s ours am: 081fc9279b
-s ours am: 0585247398
-s ours am: 2bb6767c1d
-s ours am: 65dc2d6b82
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954031
Change-Id: I0046ab090e09f9866efeb70b9dcbfd066a716728
2020-10-30 17:23:35 +00:00
Bill Yi
fbdc5de687
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730
-s ours am: d1e8e10ff6
-s ours am: f17df9c272
-s ours am: 395e567cf2
-s ours am: 27e308d4f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954126
Change-Id: I6f10527487fd005bdfbdd1eb4aee7fcec542c86c
2020-10-30 17:23:21 +00:00
Bill Yi
9c61a3a9f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730
-s ours am: d1e8e10ff6
-s ours am: 0ac3724dfd
-s ours am: 38f8d96aed
-s ours am: fcbb855355
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954126
Change-Id: I4c17574f2a8484771e602d1f33c222447b33c87e
2020-10-30 17:23:04 +00:00
TreeHugger Robot
5f5d754af2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4
-s ours am: 081fc9279b
-s ours am: b81eb46545
-s ours am: c7b05589f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954031
Change-Id: I39ffdb7958ef6b7d253badd4723b13a783cab104
2020-10-30 16:51:40 +00:00
TreeHugger Robot
65dc2d6b82
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4
-s ours am: 081fc9279b
-s ours am: 0585247398
-s ours am: 2bb6767c1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954031
Change-Id: Ieef604e9751ab68e3883e0e30ece0bf7aef756ba
2020-10-30 16:51:34 +00:00
Bill Yi
27e308d4f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730
-s ours am: d1e8e10ff6
-s ours am: f17df9c272
-s ours am: 395e567cf2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954126
Change-Id: I6d984a439fc9543967453aeecab085aa119ca25e
2020-10-30 16:51:19 +00:00
Bill Yi
fcbb855355
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730
-s ours am: d1e8e10ff6
-s ours am: 0ac3724dfd
-s ours am: 38f8d96aed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954126
Change-Id: I08100b97143cf5a1825647e29cc0caa77336a8bb
2020-10-30 16:50:52 +00:00
TreeHugger Robot
c7b05589f2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4
-s ours am: 081fc9279b
-s ours am: b81eb46545
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954031
Change-Id: If1ba3303b884192975aca3aeb869b30f473a5f30
2020-10-30 16:40:49 +00:00
TreeHugger Robot
af83b9897b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4
-s ours am: e0b0815077
-s ours am: ee1897125b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12954031
Change-Id: I6a575d9b26094546d4381a2771dec79e27152197
2020-10-30 16:40:12 +00:00