Commit Graph

84661 Commits

Author SHA1 Message Date
TreeHugger Robot
1ab5e32814 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7 am: 872093e29d am: cd1451ce53 am: 6e66ed699b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: Iafc35823337b79faa733f72584e841c031104942
2021-05-18 12:09:15 +00:00
Hugh Chen
acb13402ed [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 am: adecb886fb am: 0922c78b70 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56de9abeedb6a7f74e33e105610c0e8eec20ca28
2021-05-18 12:09:14 +00:00
TreeHugger Robot
a7f53a8d76 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c am: 78f4bcf7d8 am: 43e9c3e308
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ie6037068284f376fe362617cb1076453a3fe1071
2021-05-18 12:09:03 +00:00
Hugh Chen
b14b3512b8 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b am: c6a9224864 am: 412678bf13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10ea8bbd3b31efa53b9d5228daffd544133d7630
2021-05-18 12:09:02 +00:00
Wesley.CW Wang
2ccba0d2ee Fix color check error am: 7a8d2f4486 am: 58c34f2ce3 am: d8c7606faf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: Id6368f516758673e0b73cd91c0174c841d1137d6
2021-05-18 12:08:52 +00:00
YUKAI HUNG
e2e61089cc Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2 am: 16fe59dab7 am: 91d9b370e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: Iaa0b8796f9dbe05f2900064125f1d50a326d574f
2021-05-18 12:08:44 +00:00
Jason Chiu
fb62c8622b Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69 am: ad838712ed am: b22d9bdb0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: Ic4d5376b837af1e4b3f602fd19efcc4341b16cb7
2021-05-18 12:08:32 +00:00
Wesley Wang
99dbb64fab Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 am: c06523741c am: 3d615d4e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: Ic28195a4e2f7703683a77e329f9c8ba56a9cde4e
2021-05-18 12:04:08 +00:00
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
Arc Wang
9c191a1018 Rename audios to audio am: 6062b6491d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518465

Change-Id: I5a004d25ba38d510ffdb446e49fd5b964463f434
2021-05-17 08:25:41 +00:00
Arc Wang
44bc515588 Storage Settings shift profile selection tab position am: c0b5ba5225
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441414

Change-Id: Icd44f180bf49677adceae632ead24611fed95ffa
2021-05-17 08:25:36 +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
Arc Wang
6062b6491d Rename audios to audio
Bug: 186635176
Test: build pass
Change-Id: I0d909f639fe36edf2e5088c7ec219cceee4e963a
2021-05-17 14:11:17 +08:00
Arc Wang
c0b5ba5225 Storage Settings shift profile selection tab position
In this change, Storage Settings main UI is composed by 3 fragments.

StorageDashboardFragment only shows when there is only personal profile for
current user.

ProfileSelectStorageFragment (controls preferences above profile tab) and
StorageDashboardNoHeaderFragment (controls preferences below profile tab)
only show when current user has installed work profile.

Bug: 174964885
Test: atest com.android.settings.deviceinfo
      atest com.android.settings.deviceinfo.storage
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
Change-Id: I50dea2fbcae39a1488e648f3ca615f54840e19d5
2021-05-17 14:07:24 +08: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
Treehugger Robot
21c08903e2 Merge "Settings: remove Bluetooth related text from DNS-dialog" am: ca3051403f am: a786f86808
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708562

Change-Id: I87d9bdbe2743e45493ecd38d4aa7bd280593f9c3
2021-05-17 04:17:12 +00:00
Treehugger Robot
a786f86808 Merge "Settings: remove Bluetooth related text from DNS-dialog" am: ca3051403f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708562

Change-Id: Id142445ac2a16be54f0bbc8afdc9ce03b1676ea7
2021-05-17 03:51:53 +00:00
Treehugger Robot
ca3051403f Merge "Settings: remove Bluetooth related text from DNS-dialog" 2021-05-17 03:19:59 +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