Commit Graph

84096 Commits

Author SHA1 Message Date
Wesley Wang
7a244f3e1b Merge "Update battery usage summary" into sc-dev am: 56488ef84b am: d591642bb7 am: 2e663eb5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: Ibaf5842822302009180c65aebf099c2312b47c88
2021-05-18 12:04:01 +00:00
Julia Reynolds
f52645b236 Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 am: 9936e10d1e am: aef5f6adce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: I595e0cd87c2cfc6a744aa274691a2b003178993e
2021-05-18 09:47:01 +00:00
TreeHugger Robot
d1ad7d93a0 Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860 am: 82ddd0b57e am: fcfd177aad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: I42badfa84e8ee57f15062ae9563b4f93f8f97da7
2021-05-18 09:41:32 +00:00
Wesley.CW Wang
2041212a4f Update battery status good icon color am: 021e6b131f am: 91062b1af8 am: 59b3f3e129
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I402f58965a73886aa89ddb2751cff2190a0db0dd
2021-05-18 09:41:25 +00:00
Tom Hsu
192891ba4b Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev am: fa024d6fc8 am: 444fef8f4c am: 17ebc62223
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456005

Change-Id: I5142ad7d76d00e31a088453c2a81a7d5f5bdd77a
2021-05-18 09:41:20 +00:00
Ryan Lin
bca6d4e781 Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f am: cb1cb02224 am: 1580cd21ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010

Change-Id: I7333709ffae0a0bc7e380ef1b97ce014b33308a7
2021-05-18 09:41:15 +00:00
Syaoran Kuo
dc01d06a10 Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4 am: 37ab5dbc8f am: a0e43be923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004

Change-Id: I61e6bc71a073970cb3e3db4238352e24e4b6f86e
2021-05-18 09:41:07 +00:00
TreeHugger Robot
f58985d493 Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c am: 0819ab21c5 am: fabd6033e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998

Change-Id: I59d11f8cb927c0b710b2f7283eeb7e43cd2d4401
2021-05-18 09:35:47 +00:00
Weng Su
ea7fb69a41 Merge "[Provider Model] Add progress bar to internet panel" into sc-dev am: 72c3debb0b am: 1ab5ed70af am: 5302ff6475
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442219

Change-Id: I49f4219106d693a8003078ceca614786c79bcd10
2021-05-18 09:35:38 +00:00
YUKAI HUNG
a8afbb35b0 Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev am: 48535ffd29 am: 27449fb2a7 am: 9733bfa405
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456009

Change-Id: I89dfa5018f459971575952e49f45cf8908b4cba3
2021-05-18 09:35:32 +00:00
TreeHugger Robot
c2dc065b8c Merge "Commit changes only when activity is closed" into sc-dev am: 257b3ec584 am: d0c043b0a9 am: afbb8905b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463203

Change-Id: If88632148570857e99f29e7f8f5128261c30d292
2021-05-18 09:35:26 +00:00
TreeHugger Robot
d56cf3038f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5c29b05ab3 -s ours am: 1b3330409b -s ours am: 32829de55e -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: Ifdabe514057da6aa4b2e3eb0f6d19a385c26ebb1
2021-05-18 09:34:55 +00:00
TreeHugger Robot
dd9b373d1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e1aa1f04c0 -s ours am: 5d6b03e51c -s ours am: 823de830a2 -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: I0a20a5a2f3fb8c17fe1f5e7878fe74a77327ccce
2021-05-18 09:34:49 +00:00
ykhung
50ed9d347f Build a bridge to control whether the graph is clickable or not am: d8d5335096 am: fd541575ea am: f0d1544bd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456008

Change-Id: I6b80789d77047044e1b1eaead64a1aa0814359e7
2021-05-18 09:34:43 +00:00
ykhung
ab962d82f4 Fix UI flashes issue when entering to the app in the cold start am: 5b27fd923a am: a4641ab27d am: a2cfc39b0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456007

Change-Id: I018fdf0ed0cefc6b55b0d2cd3ca85fe5db50acf5
2021-05-18 09:34:32 +00:00
Treehugger Robot
aedb67657d [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: e9bedba498 -s ours am: ee4eccf5a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbcb2e39c3075a06dd2dba3e88e327528b773de2
2021-05-18 09:23:59 +00:00
Xin Li
c855e173e4 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours am: ff21be103b -s ours am: 16f8c68d8c -s ours am: 6d919bb2c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40adac37dfd0f2f8d09a45933dad15a18a8808e0
2021-05-18 09:23:52 +00:00
Yu-Han Yang
98631111ad Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac am: a5464f4438 am: fc0eebc86e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443640

Change-Id: I15ba4b2bbe92f1abbd101b69f48e96c9eeedcab1
2021-05-18 09:02:26 +00:00
Curtis Belmonte
ecca38184f Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3 am: 1906ce95ab am: 5b14a163cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733

Change-Id: Ia56420e53b77bf1131f9f67fd1f268baaca661dd
2021-05-18 09:02:14 +00:00
Edgar Wang
61644aaad1 Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15 am: 1f8a8893ae am: 65f4386b05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003

Change-Id: Ie60fcd5b523e20b95dfcea958c88a2d0cb4f26e1
2021-05-18 09:01:04 +00:00
Bill Yi
411d863218 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I12473116e2531669ff9a7e59882604e10f2dcf6e
2021-05-18 07:55:11 +00:00
Bill Yi
cbb164a016 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I11dfca6cfe1eaeeb5739a670223ffe3bb96aa756
2021-05-18 07:48:44 +00:00
TreeHugger Robot
8bc674c0d9 Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837 am: 8f26c5c25f am: c658dfe610
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513

Change-Id: Ic6790b1d9da69bd89480fc7b96cc80424f3cd916
2021-05-17 17:09:51 +00:00
Xin Li
855c629a42 [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: 93c8398216 -s ours am: 1c0267e8c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibae959b15a5e2b738577d6f1f5e6d50cb7adbfcb
2021-05-17 07:03:24 +00:00
TreeHugger Robot
63e5d424c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours am: 0c847ab549 -s ours am: 7eee3839c9 -s ours am: bb837f1ec0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73b477950f96905732cf8e7d89c3a965fa4e9cf4
2021-05-17 06:02:13 +00:00
Bill Yi
61d5ef8d29 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -s ours am: 07eb180b1a -s ours am: 23c2c7dc7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33454fca3b0c3fc551e20e437dcf805065281f6e
2021-05-17 06:02:07 +00:00
TreeHugger Robot
fc61d31128 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -s ours am: b3c02e1811 -s ours am: af8c6c83da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia535ac639d4f240444d785b944ea53bcd736a433
2021-05-17 06:02:01 +00:00
Bill Yi
024a75dddc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours am: bd905bff88 -s ours am: cc4940cc2a -s ours am: e9e254a992 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3148ebf71a58939452b36ddbc569d817ad41a2b
2021-05-17 06:01:55 +00:00
TreeHugger Robot
443529b86a Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc am: 4fbf1990bf am: 5bdef1f980
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204

Change-Id: I9bfb63b8eb0521e41b0d0aec48ab57571172e836
2021-05-17 06:01:49 +00:00
ykhung
6679ca1870 Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f am: 985c9a3d42 am: 246884a4e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006

Change-Id: Ibc349f4c59363063f09ebe2747c41c1ab2ec3dad
2021-05-17 06:01:42 +00:00
Alex Stetson
a11ef76365 Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d am: 2f3826948a am: 74e9845ba2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754

Change-Id: I625517766e3038a10263eae00fa5cf351429e54e
2021-05-17 02:43:10 +00:00
TreeHugger Robot
56313dcb81 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 am: adfbb68838 am: d4ddfe7496
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999

Change-Id: I9167d8cffb12b21f83349fa799953c04d19c6671
2021-05-17 02:11:36 +00:00
TreeHugger Robot
b8c7782bc3 Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad am: 3fb211bc4e am: e2608c118b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: I67a5cb100101fee0e67dacc1ad71aab7964b38e1
2021-05-17 02:11:30 +00:00
Yanting Yang
2d28b68e90 Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb am: f94fe0e86c am: aa904a9ea2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: I67e045bad39b560777a1642f740df7cd0e5308c0
2021-05-17 02:11:24 +00:00
Syaoran Kuo
fbad14ff5a Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 am: 84dfab789e am: bdb5723002
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I8e85c46eb205c0f582ab55ec7dc512c9adb417e2
2021-05-17 02:11:17 +00:00
TreeHugger Robot
29882e1031 Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed am: 1b2bf94780 am: b2baeba56a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: I6f2c8e95151bee24c11a00d49c9c60ed94ab33bf
2021-05-17 02:11:12 +00:00
Edgar Wang
d5e6cbab00 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e am: 2b301c466f am: 116b57797b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: Idab785fabeb96b5505e51459a51c2735857fe331
2021-05-17 02:11:05 +00:00
TreeHugger Robot
20771f8453 Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad am: 947f4d458a am: 3bfdd162a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: If4ba7a42676c695237a0c56b9dc7aae728aedcae
2021-05-17 02:10:57 +00:00
Treehugger Robot
bc48f281c8 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59 am: 151435a12f am: 3a39be999a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: I046c881ceb1fa7de62b9c39ef23317498a385495
2021-05-17 02:10:37 +00:00
TreeHugger Robot
0c2baecbdf Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6 am: b829a124a1 am: 50073054dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: Ic74eacd0d60c6ad03a211e27c14526beb9019993
2021-05-17 02:03:39 +00:00
Betty Chang
bce38c31b1 Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1 am: f843e9f9f1 am: c041e2123f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413

Change-Id: I9597345b6954ede79d20e1489a23fe4b45b5cb50
2021-05-17 02:03:33 +00:00
TreeHugger Robot
0b2527adeb Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052 am: ceece92af2 am: 2cdb44cb6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406

Change-Id: Ic440d822af85ebf9d518279549bac9d766877700
2021-05-17 02:03:27 +00:00
TreeHugger Robot
1674554eba Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd am: fa9a904c1f am: 493da906c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154

Change-Id: I3a617b929dbb5922b0fe5c2ca7d10e11e72afd6a
2021-05-17 02:03:20 +00:00
Julia Reynolds
880972e58e Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27 am: ffde414545 am: c644ded2c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218

Change-Id: I522f44e4b855e26311152d49165ca369acfc860b
2021-05-17 02:03:14 +00:00
TreeHugger Robot
c805d6fcc6 Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684 am: 7bb2eff8cc am: adcdff9e06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217

Change-Id: I9dea05bfb7876beb3da5972a579301c8229198f9
2021-05-17 02:03:09 +00:00
Menghan Li
1e0b55e735 Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9 am: a65e9a7ec5 am: fe33a799f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965

Change-Id: Icdb4a4c0e12db30ea817c1425e043454bb1eb130
2021-05-17 02:03:04 +00:00
Menghan Li
167d8a41f9 Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b am: 88df66be69 am: 800c75fadc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407

Change-Id: I1fc39d9a93b40180ecce68f5b6d79a726bcf1555
2021-05-17 02:02:59 +00:00
Les Lee
a706580012 [automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours am: 956fdad9c6 -s ours am: cf4980bcc4 -s ours am: 696d0ded3d -s ours
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history

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

Change-Id: Ic1d806bc94c18556b7dfd460ede92da163cba87c
2021-05-17 02:02:54 +00:00
TreeHugger Robot
58cb2a14fc Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada am: 6d44c61935 am: 5e3232cc63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866

Change-Id: Ia2cc2d741ea181a9334e1645acb9bd8a5c6dea74
2021-05-17 02:02:47 +00:00
TreeHugger Robot
900c11ca2b [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours am: 2c8ed65745 -s ours am: 461b72cdc7 -s ours am: fd730ef2de -s ours am: 0f49602b97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30b3576a709af8bbd45fbf84e54f11542bfb0754
2021-05-17 02:02:41 +00:00