TreeHugger Robot
83d38a6e5c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498659
Change-Id: I5dc2b00f2be3cadc44181875b1c7af437cf8af64
2021-05-11 16:36:31 +00:00
TreeHugger Robot
d48c64d321
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500796
Change-Id: I2c9bdf3f771fd4fa5411c9e17266ae4f56a029e9
2021-05-11 16:36:24 +00:00
ykhung
c17823dacf
Refine graph top margin and expand/collapse icon theme color am: 525659c291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692
Change-Id: Ibc62ebdd10b69cd562c6f9bf1a418a2e82218fbb
2021-05-11 16:35:50 +00:00
Julia Reynolds
fef73ef82a
Don't show DND access settings in managed users
...
Test: launch direct intent in a managed user
Fixes: 187304252
Change-Id: I1cfcf8c147fc47b4e2fb2a725cba9846e4f09055
2021-05-11 16:35:42 +00:00
TreeHugger Robot
6d1e8eed2f
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
am: 63cc6f167a
am: d31c3649ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I2ceb77a463d8ca4e50735e67dc949d4f4889e5cf
2021-05-11 16:35:25 +00:00
Hugh Chen
aa53cfb0c1
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
am: e90fdbf747
am: 445869a724
-s ours am: 0f74d4831c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I95f8f22595071978512a4927148d335319dc54ab
2021-05-11 16:35:24 +00:00
TreeHugger Robot
7291e2a3c9
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: 0e37bc27a2
am: a6f32496f2
am: 9ff09ba818
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Ia2844169fb8a2b00e53d8705de0bd4371d395ef8
2021-05-11 16:35:12 +00:00
Hugh Chen
b3aeb23b44
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 425430345d
am: 47666c2d15
-s ours am: 33228acc37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: If90b2a6871b677f48d33714192b2094c41b6afa8
2021-05-11 16:35:11 +00:00
TreeHugger Robot
3e7351d04c
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 256de04464
am: 3942491a7f
am: e492441e16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I5daa78c57f704a9bfde1eead77e28399cfee17f7
2021-05-11 16:34:47 +00:00
Hugh Chen
a9859b72a1
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: 6fee770ea0
am: 8bf67a7f4b
-s ours am: 0bc5e289a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Iee3dca2a82c4535ba09d609c8f2b34df2f9f599a
2021-05-11 16:34:46 +00:00
TreeHugger Robot
5c1f453b99
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: e790b378c3
am: 8be84e5e36
am: dff59b4188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I5cb56398144e030b1ff5fa6919bea379f907efb2
2021-05-11 16:34:00 +00:00
Hugh Chen
e56793efa0
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours am: 933f807885
am: c740d7ad82
-s ours am: 5d7d1a6b38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I3d9f80c84fa609af5937c1b4644d3fd4a4506b0d
2021-05-11 16:33:59 +00:00
TreeHugger Robot
36e37d5449
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 8b76d88e55
am: 2097ca6a73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I3c42913de28dc228f48cefe99cc7f7ba408fb20f
2021-05-11 16:33:40 +00:00
Hugh Chen
af5664bea5
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
am: 68f4157827
-s ours am: 628a92c252
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I1cdeaf4e1eb26d762a7ddf31b497acc52c3b4514
2021-05-11 16:33:39 +00:00
TreeHugger Robot
66811dc96c
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: b2c3b4f4cb
am: 8cea64eae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I90f2c5137abe91c684abe34f7572d27412d9c3e5
2021-05-11 16:30:17 +00:00
Hugh Chen
05209c1536
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 0248e7b7cf
-s ours am: caf59cbbcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I77673b7b7af144027faab91aa590dcdfe5ab4861
2021-05-11 16:30:16 +00:00
TreeHugger Robot
798b9051e7
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 85410254c7
am: 872093e29d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Ib9826bbf56e14d28a938a2170497feed7ac08f15
2021-05-11 16:29:48 +00:00
Hugh Chen
6beba0198b
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: ac30bfef8c
-s ours am: 7eeee9be6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I800b3bfbb89d069fbbc41f86513e4645edbbd3cd
2021-05-11 16:29:46 +00:00
TreeHugger Robot
57ced04e30
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: cb2b575a9d
am: a5d3b8a45c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I2657fd8f2674763a59a18c3182cdd8a13d16deae
2021-05-11 16:29:06 +00:00
Hugh Chen
6340f5023a
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
am: e914289a2c
-s ours am: 810abfc77b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Ie849ad46c439d1b5456c21a4aa62a746f2eb65fa
2021-05-11 16:29:05 +00:00
Wesley.CW Wang
00d3eadbe4
Fix color check error am: 7a8d2f4486
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679
Change-Id: I828664032fb2cdeac4edc2aa2024d55662ae6f79
2021-05-11 16:28:33 +00:00
YUKAI HUNG
ad76d9971e
Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919
Change-Id: I32e8ffaf706a393d8b0a7ea8b023a4f62da57c05
2021-05-11 16:27:59 +00:00
Jason Chiu
4765dd2849
Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412
Change-Id: I00b258a624caa218ea71732a3d3209624dc3cbf3
2021-05-11 16:27:47 +00:00
Wesley Wang
2c3ba9e13c
Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918
Change-Id: Ic5f6d49324323bd06104edb984289bf599ac2072
2021-05-11 16:27:04 +00:00
Wesley Wang
3152423de2
Merge "Update battery usage summary" into sc-dev am: 56488ef84b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916
Change-Id: I4ff4ac9bc77826e57b0c5f751bc8fbdb2d9539dd
2021-05-11 15:48:23 +00:00
Hugh Chen
c556938807
RESTRICT AUTOMERGE Fix unable to send file via OPP
...
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.
This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.
Bug: 186490534
Bug: 179386960
Bug: 179386068
Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0
)
2021-05-11 15:45:18 +00:00
Julia Reynolds
1d90527fbe
Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497
Change-Id: I3fd8fa7f47be72c54d140ed987f0226f483d0ffc
2021-05-11 15:21:54 +00:00
TreeHugger Robot
57d2131a8a
Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515
Change-Id: I3a983a334a4d0b998eaa6244a89a2f2f3890d96f
2021-05-11 15:15:47 +00:00
Wesley.CW Wang
b9599ae39a
Update battery status good icon color am: 021e6b131f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012
Change-Id: I8beecf2237ea359ab8bf4cf981527463c47b589c
2021-05-11 15:15:42 +00:00
Tom Hsu
e6615a63db
Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev am: fa024d6fc8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456005
Change-Id: I23343902a67a9b8c2473349bbf9348fd18adb999
2021-05-11 15:15:38 +00:00
Ryan Lin
a02e977d36
Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010
Change-Id: I7c63e0c8f623d687be25aa97e4123dcf99c50618
2021-05-11 15:15:32 +00:00
Syaoran Kuo
2cfe02b17b
Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004
Change-Id: I339c77e534e8693c94c0957e9e320962901cbcc7
2021-05-11 15:15:27 +00:00
TreeHugger Robot
d0fdb0f74c
Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998
Change-Id: I5bbdde03e6f815ce126cda645c8075b0b6ef8e65
2021-05-11 15:15:11 +00:00
Weng Su
0ebc4df04e
Merge "[Provider Model] Add progress bar to internet panel" into sc-dev am: 72c3debb0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442219
Change-Id: I38371cdcb84bb9059e074ba96c308688702dc863
2021-05-11 15:14:56 +00:00
YUKAI HUNG
ab67b7ba2c
Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev am: 48535ffd29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456009
Change-Id: Ia75bf4c608056b7fd2f1b9a012a96abab9802f9d
2021-05-11 15:14:51 +00:00
TreeHugger Robot
7ed6723639
Merge "Commit changes only when activity is closed" into sc-dev am: 257b3ec584
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463203
Change-Id: I05845e400b37d042405b6dd7e33fe8210c7cded2
2021-05-11 15:14:46 +00:00
TreeHugger Robot
9cc20b1617
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5c29b05ab3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14479328
Change-Id: I01ea2cec901be9a17b6834f2fe4ac5b56584f946
2021-05-11 15:14:29 +00:00
TreeHugger Robot
1eec0a6df3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e1aa1f04c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14479488
Change-Id: Iab3886bdbf2e294c0d8e3ad93d29860e6f2c9001
2021-05-11 15:08:41 +00:00
ykhung
c6d1eba0df
Build a bridge to control whether the graph is clickable or not am: d8d5335096
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456008
Change-Id: If50bf5e3699557b381b759c3e6bceff0b86f0c1a
2021-05-11 15:08:35 +00:00
ykhung
985ac984c3
Fix UI flashes issue when entering to the app in the cold start am: 5b27fd923a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456007
Change-Id: I072d5e9948792fed6467831e31416b7d416296e6
2021-05-11 15:08:29 +00:00
Treehugger Robot
3343c61755
[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00
am: 8c84477a04
-s ours am: d13156d85a
-s ours am: e704cef070
-s ours
...
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: I5a21a7bb6d8c510a6152b1eddf3d67d568a3c7b8
2021-05-11 15:03:33 +00:00
Xin Li
437cc02e8e
[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f
am: c41debcf7f
-s ours am: 06e9e8b3a9
-s ours am: ff21be103b
-s ours
...
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: I81f45f7074832d4b534b5773a0f55c87b66a9340
2021-05-11 15:03:31 +00:00
Yu-Han Yang
8055e0909a
Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443640
Change-Id: Ifb268c34e6b1e77197e565eeea103e8ed801273d
2021-05-11 14:58:59 +00:00
Curtis Belmonte
a384cee63c
Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733
Change-Id: I7e97f4b933d7d9d90cca53bd3e702c21a3fb6e10
2021-05-11 14:57:49 +00:00
Edgar Wang
9790762101
Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003
Change-Id: I56bde38153b1e9371418f6c74e7fe188ab4971bb
2021-05-11 14:57:32 +00:00
TreeHugger Robot
5113155194
Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513
Change-Id: Iff0120d038448d3e739a93a9cf8ff90917be2c2b
2021-05-11 14:57:15 +00:00
Xin Li
6f8f1260d8
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c
-s ours am: 1b68f3bfd3
-s ours am: a7d220aad7
-s ours am: e49a0d1b4e
-s ours
...
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I9b275f79563f16e7ee16141e9f51aec9e17c787e
2021-05-11 14:53:55 +00:00
TreeHugger Robot
82c1e0ae12
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867
-s ours am: cefbb1d83a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: Ifaad1baedb515d91ef2d899059dabbfd5b2ae291
2021-05-11 14:50:10 +00:00
TreeHugger Robot
d1625e0793
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794
-s ours am: 84ed78af0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: I189470dc12111e6ddb088611a94419485e266231
2021-05-11 14:50:06 +00:00
TreeHugger Robot
647e0ee2ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491513
Change-Id: Ic234fd718791b2790665336914b24c0b6f63c957
2021-05-11 14:49:26 +00:00