PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,736 Commits 1 Branch 0 Tags
37ab5dbc8f89d1f51a7be1649262dca1ff1c73a4
Commit Graph

81736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syaoran Kuo
37ab5dbc8f 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: Iabf06a3427349d249629cda84b5d045abbe71236
 2021-05-10 07:35:56 +00:00
Syaoran Kuo
e37d12e5c4 Merge "Add more log for debugging resource id issue." into sc-dev 2021-05-10 07:17:28 +00:00
TreeHugger Robot
0819ab21c5 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: I532465e9d68671167ac6a00409aef793d9f80226
 2021-05-10 06:20:52 +00:00
TreeHugger Robot
57d8d38a3c Merge "Merge existing bundle with ActivityOptions" into sc-dev 2021-05-10 06:05:37 +00:00
Weng Su
1ab5ed70af 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: I610708b3b8053083704684d67bfe73231b16a27d
 2021-05-10 05:44:33 +00:00
Weng Su
72c3debb0b Merge "[Provider Model] Add progress bar to internet panel" into sc-dev 2021-05-10 05:28:15 +00:00
Weng Su
c407a2d9f8 [Provider Model] Add progress bar to internet panel 
- Show progress bar when Wi-Fi scanning

- Show "Searching for networks..." sub-title when Wi-Fi scanning

- Remove "Wi-Fi" from searching networks string

Bug: 178774497
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=PanelFragmentTest

Change-Id: Ic05b939bef3b106845fe90db41eb09f0e15756f4
 2021-05-10 05:27:59 +00:00
YUKAI HUNG
27449fb2a7 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: I282052e68f5db61ce9ad63d0b9beda583e062009
 2021-05-10 04:02:41 +00:00
YUKAI HUNG
48535ffd29 Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev 2021-05-10 03:44:31 +00:00
TreeHugger Robot
d0c043b0a9 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: If6a850198949aeb4544988bc7db5056361b3299c
 2021-05-10 03:09:04 +00:00
TreeHugger Robot
257b3ec584 Merge "Commit changes only when activity is closed" into sc-dev 2021-05-10 02:49:31 +00:00
TreeHugger Robot
1b3330409b [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: Id7ed97400a3ba2e55290b08322721f0904cb21d0
 2021-05-09 21:24:51 +00:00
TreeHugger Robot
5d6b03e51c [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: I0365a86a6329ddd37f0b284e274f84a4c9e72636
 2021-05-09 21:24:37 +00:00
TreeHugger Robot
5c29b05ab3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:38:26 +00:00
TreeHugger Robot
e1aa1f04c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:35:21 +00:00
ykhung
28896636b0 Support old pixel devices to adopt non-clickable chart design 
For clickable devices:
https://screenshot.googleplex.com/ktBfjhhHQVYfTmF
https://screenshot.googleplex.com/BYutnpu9Dys2sa6
For non-clickable devices:
https://screenshot.googleplex.com/64NaKhRDrhfBqBQ

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: I5bc0bb31946ccb20007ea31d90c05673a200e072
 2021-05-09 16:30:11 +00:00
ykhung
fd541575ea 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: Id36ed86121f46c9bdf4ed2e587d8af897513ab07
 2021-05-09 05:13:26 +00:00
ykhung
d8d5335096 Build a bridge to control whether the graph is clickable or not 
Create a bridge to read phenotype flag from GoogleSettings to control
whether each time slot in the graph is clickable or not.

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: If8b58dcaa50ad5fb6b447ca5b7146639ee31a9df
 2021-05-09 04:46:41 +00:00
ykhung
a4641ab27d 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: Iedd26345a81b048d08b72a2e9588e8b9d852b250
 2021-05-09 04:29:19 +00:00
Bill Yi
ad89ad031d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia6b625e3577e40db1357ae8e8fa3f7ff41ae6081
 2021-05-08 20:19:39 -07:00
Bill Yi
3c692fcca9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib5d8a690731678d03128d9df5cde738ea4e25f2e
 2021-05-08 20:10:20 -07:00
ykhung
5b27fd923a Fix UI flashes issue when entering to the app in the cold start 
1. fix the chart % info will flash issue by deferring the showing time
until the chart content is ready to show (set default as invisible)
2. fix the category title will flash issue by set the default value as
empty to avoid refresh the title twice in the start time

Bug: 177406865
Test: make SettingsRoboTests
Change-Id: If8f247cf5b01c529bc5e4d18fcf409ba296cc2f4
 2021-05-09 01:56:09 +00:00
Treehugger Robot
e9bedba498 [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: If1b281255c552262b7b2639b8ee7bbe7c2d9f42c
 2021-05-08 23:25:00 +00:00
Xin Li
16f8c68d8c [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: I8a9e79e0160f62abc7a216225f4bd6364005de9f
 2021-05-08 23:24:56 +00:00
Treehugger Robot
e704cef070 [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -s ours am: d13156d85a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie66323fe2c9c5903b5da7bb152b854ec09a9be08
 2021-05-08 23:07:35 +00:00
Xin Li
ff21be103b [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib023e63046bc2fc541d2a8754a544e4f17aad2a1
 2021-05-08 23:07:26 +00:00
Treehugger Robot
d13156d85a [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -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: Iccb4a95dc5c6863ea96897a392049b6ade646abf
 2021-05-08 22:45:15 +00:00
Xin Li
06e9e8b3a9 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -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: I17c63dac08252e5f31b334731e25837ace0ab965
 2021-05-08 22:45:12 +00:00
Treehugger Robot
8c84477a04 Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137

Change-Id: I38f2d600c3bd14f3b59de36152a19a4f3a994e9d
 2021-05-08 22:01:03 +00:00
Xin Li
c41debcf7f DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137

Change-Id: I7325883698b037f16083f2dfa39db84feb21f698
 2021-05-08 22:00:38 +00:00
Treehugger Robot
7e8f5aca00 Merge "DO NOT MERGE - Merge RQ2A.210505.003." 2021-05-08 21:38:02 +00:00
Yu-Han Yang
a5464f4438 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: I6f6cd56d249a0ca25378d50fbe6814b008058e4c
 2021-05-08 16:19:18 +00:00
Yu-Han Yang
f730edaaac Merge "Revert "Remove dynamic location settings footer"" into sc-dev 2021-05-08 15:58:10 +00:00
Curtis Belmonte
1906ce95ab 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: I559a0c26f3fc9f8478c631b18be3e6895a8a599b
 2021-05-08 07:49:11 +00:00
Edgar Wang
1f8a8893ae 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: I9b4a13836656ebb2180012ad415759798a12c32a
 2021-05-08 07:40:10 +00:00
Curtis Belmonte
5ece4babd3 Merge "Revert "Turn on the transition flag"" into sc-dev 2021-05-08 07:38:45 +00:00
Edgar Wang
9da824db15 Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev 2021-05-08 07:29:36 +00:00
Xin Li
bb6f5b264f DO NOT MERGE - Merge RQ2A.210505.003. 
Bug: 187544653
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Change-Id: I9a8ebe5b65b682015225c8c1ba9de1984bac7a8d
 2021-05-07 23:32:36 -07:00
TreeHugger Robot
8f26c5c25f 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: I099c72366483528bb281bb87aa2525c457e3f380
 2021-05-08 03:07:58 +00:00
Xin Li
93c8398216 [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: I41b74e3aae1cde711444bd1bef977867e63747d9
 2021-05-08 03:06:32 +00:00
TreeHugger Robot
67fd37c837 Merge "Controls/Wallet privacy settings" into sc-dev 2021-05-08 02:46:54 +00:00
Xin Li
e49a0d1b4e [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 skip reason: subject contains skip directive

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

Change-Id: I6d1066d472d9b053a19ac80c8dba094d0017a271
 2021-05-08 02:37:05 +00:00
Xin Li
a7d220aad7 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -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: I810710363abf4ab5cffa5d3c05095468716d2466
 2021-05-08 02:13:47 +00:00
Xin Li
1b68f3bfd3 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -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: Ifc6c1d5d1192a56c9f33ded1a984e1d4b73157c9
 2021-05-08 01:48:55 +00:00
Xin Li
6811428c9c Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." 2021-05-08 01:28:18 +00:00
TreeHugger Robot
7eee3839c9 [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 skip reason: subject contains skip directive

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

Change-Id: Iabe7a67f2dd1be3faf2f31d9eecfc781ee688ed3
 2021-05-07 23:46:22 +00:00
Bill Yi
07eb180b1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -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: I7464ef189a859de3e7e0f3ef8bd23433fcd16afd
 2021-05-07 23:46:19 +00:00
TreeHugger Robot
b3c02e1811 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -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: Iab045fcf3c6f030d4099e2b1a47fea175eb976ba
 2021-05-07 23:46:16 +00:00
Bill Yi
cc4940cc2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours am: bd905bff88 -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: Ia081b7aeb60617f1197379cd78c6019b5f1ebbca
 2021-05-07 23:46:13 +00:00
TreeHugger Robot
0c847ab549 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -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: I1ac1d36b4343b3d008d21090ee9ac69caae48460
 2021-05-07 23:36:59 +00:00