PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,168 Commits 1 Branch 0 Tags
430a9a7aa5734b34b216da1b9aa3b65dabea08cc
Commit Graph

82168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Hsu
fa024d6fc8 Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev 2021-05-10 08:35:36 +00:00
Ryan Lin
07b873c77e 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: I3f3aa9e196f2d647b34e399f1003701b36109383
 2021-05-10 07:33:05 +00:00
Syaoran Kuo
f879cff1d6 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: Iecc7774fa844c3ea14a570476f007ca5901018c2
 2021-05-10 07:32:47 +00:00
Ryan Lin
4523f9200f Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev 2021-05-10 07:27:46 +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
098c819eef 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: Idd5ba583cee84c4f7fdb6804255a1018cbbdbb21
 2021-05-10 06:18:02 +00:00
tom hsu
2519077d97 Show W+ when connected to Carrier Wi-Fi Network 
Internet picker
  - https://screenshot.googleplex.com/7k4ojF65a8Bis5R
 Internet panel
  - https://hsv.googleplex.com/6749112168873984
Bug: 185431894
Test: atest passed

Change-Id: Ic79686b47f033870ad8e7741f9baf3230dde7b7c
 2021-05-10 14:08:05 +08:00
TreeHugger Robot
57d8d38a3c Merge "Merge existing bundle with ActivityOptions" into sc-dev 2021-05-10 06:05:37 +00:00
ryanlwlin
95616af6fa Fix Punctuation inconsistency in the Magnification shortcut pop up 
The incorrect punctuation affects localization.

Bug: 187216931
Test: build pass
Change-Id: I2f2b66674946a6e5848a1879a24cb5aaddbfdc82
 2021-05-10 13:52:19 +08:00
Weng Su
d676506003 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: I51ccb6ebcffa1ce2aff7db465cf58ad63494bab9
 2021-05-10 05:41:42 +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
34e3374b97 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: Ie6c3c29ecf7fad69131ba8a4a6f7c133d8f73d1e
 2021-05-10 04:00:55 +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
737c1b8c78 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: Ibe4f0d92570dc0b43dd11c8876dfa503d96ade1b
 2021-05-10 03:07: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
99075a9e76 [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: I54eeca274e45bbe257a37800f6941f83a1bddd99
 2021-05-09 21:23:48 +00:00
TreeHugger Robot
42cfb31c7f [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: Id99037dcc4418ad2afb32f8fbe6136e2b4056c32
 2021-05-09 21:23:05 +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
5f53af1874 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: I53d413f47e3621f4baaad7859835d65d8022db81
 2021-05-09 05:11:25 +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
4e4d8adbb0 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: If983fe7b512bd3c10bbcc4b63096424b44a0b15a
 2021-05-09 04:26:44 +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
b1c94831c6 [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: Ie6c5cc23f55c12ad9c64b25d20f51c99f9fdf051
 2021-05-08 23:22:50 +00:00
Xin Li
859b4ac856 [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: I6d040ee582aeab0c571b8e860e4b2ab9b3bd8b8e
 2021-05-08 23:22:47 +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
960dd1e961 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: I886bbbaae461bb6133652dca9e593deeac2bb3d7
 2021-05-08 16:15:01 +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
28a2cec4bb 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: Iadfd17fb25a633c4b08666e1af1494a46e7feacc
 2021-05-08 07:47:12 +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
f138b5698f 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: I824e5019d35df19689863ad67f43851a660da36c
 2021-05-08 07:37:31 +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
cd6ba4729e 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: Ied3689c90e60e57e08ed40892d486edaace86bd1
 2021-05-08 03:07:07 +00:00
Xin Li
a59b3c62f1 [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: Ia9d909aca83e5633f8dff6be66d3fd39d65fd8b4
 2021-05-08 03:04:13 +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