PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,210 Commits 1 Branch 0 Tags
e2ea5ed15d00f4e15c5f816b4f81560153d6a68c
Commit Graph

85210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matt Pietal
edd1918866 Controls/Pay - Use new privacy setting 
Refer to the now centralized Secure setting, instead of local strings

Bug: 188175341
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I5fff84347c369ae94d6c8359cc49dcbcf9b6ee72
 2021-05-18 07:55:21 -04:00
TreeHugger Robot
fe9d014c8c Merge "Update style name" into sc-dev am: db6c7211e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547063

Change-Id: I9363ee0318a2785498a04829822af9348bedb35b
 2021-05-18 11:34:32 +00:00
TreeHugger Robot
db6c7211e4 Merge "Update style name" into sc-dev 2021-05-18 11:28:56 +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
Arc Wang
cf32a78aa9 Merge "Add "This device" string for default internal storage" into sc-dev am: 7c3adee295 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609995

Change-Id: I548dc62bd75fc1925f35d6463679d72956c8130a
 2021-05-18 09:35:15 +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
Mill Chen
4e168dd691 Visual update for FaceSettings 
This includes the following changes:
- Remove the face animation from FaceSettings page
- Correct the color filling of collapsing toolbar
- Make the button align with other settings
- Remove the seperator

Fix: 186804060
Fix: 187882118
Test: visual verified
Change-Id: I4b7679ced0c420b4d23a3c326ac2a93734c0b8bb
 2021-05-18 17:29:56 +08: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
Arc Wang
7c3adee295 Merge "Add "This device" string for default internal storage" into sc-dev 2021-05-18 09:18:54 +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
Arc Wang
07dc4fe79a Shows "This device" for default internal storage 
Bug: 188492974
Test: atest StorageEntryTest
Change-Id: I7278ff604f22acafd47cef2f5d613a2bf9f0e371
 2021-05-18 16:23:25 +08:00
Arc Wang
1aac3eb017 Add "This device" string for default internal storage 
Bug: 188492974
Test: build pass
Change-Id: I075441f1211b10eeb69f5a85818261d6083a5453
 2021-05-18 16:09:43 +08:00
Bill Yi
64b93de7fd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I68e6533cfd3227be4253cd2839924d5605277299
 2021-05-18 07:59:02 +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
e1ced04862 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib2fcc8cb7140ff10b4be202b67c7cac152791c5e
 2021-05-18 07:50: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
Bill Yi
863787066f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I709fca4e70ea54241c6bb553dbfa327a469021fe
 2021-05-18 07:45:52 +00:00
Bill Yi
8cecd68c0c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib190cfbca4b19a2c8281647d630837128ba64c8a
 2021-05-18 07:42:30 +00:00
Bill Yi
9afa4248cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad8f93395efff8ba022148339bd3f5315c34cdfa
 2021-05-18 07:39:35 +00:00
Bill Yi
f44fef2834 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d2a14d7fe038edf738a1fec382328f8a8564f67
 2021-05-18 07:36:05 +00:00
Betty Chang
597d2a157c Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev am: 78031d82b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609992

Change-Id: Ie0d73e83a46377277d8c1df1ad54c2506982da66
 2021-05-18 06:57:53 +00:00
Betty Chang
0853f28f5a Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev am: 2d3487f704 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609990

Change-Id: I8fbb1163a44e3afe1d891f36855dd3f19acaab38
 2021-05-18 06:57:45 +00:00
Betty Chang
78031d82b7 Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev 2021-05-18 06:47:00 +00:00
Betty Chang
2d3487f704 Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev 2021-05-18 06:41:03 +00:00
ykhung
7acf3fc852 Add metric for battery defender am: 6590b368f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554360

Change-Id: I95b8e2f1595f675c48b4f06d051b3360befc7a91
 2021-05-18 05:35:59 +00:00
ykhung
6590b368f2 Add metric for battery defender 
Bug: 188384887
Test: make SettingsRoboTests
Change-Id: Ida96deb6efe94a98cf6837b9f82758467a4d1300
 2021-05-18 05:19:45 +00:00
Menghan Li
47dc191940 Merge "Fix flake issue on SettingsRoboTests" into sc-dev am: cadd868911 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609993

Change-Id: I8e781159356f15c907fd3565232bffab37a09ce9
 2021-05-18 05:00:16 +00:00
Menghan Li
cadd868911 Merge "Fix flake issue on SettingsRoboTests" into sc-dev 2021-05-18 04:36:32 +00:00