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
1580cd21ba
Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f
am: cb1cb02224
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010
Change-Id: If86e85741eeb41f7df9e5bf51613c3b994291999
2021-05-10 08:08:16 +00:00
Syaoran Kuo
a0e43be923
Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4
am: 37ab5dbc8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004
Change-Id: I82a5d5e42a77426d3ae41e290d8fcc65c34458cf
2021-05-10 08:08:01 +00:00
Ryan Lin
cb1cb02224
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: Ic8490dfe0b10d65536988b3db938926a04953716
2021-05-10 07:36:08 +00:00
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
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
fabd6033e7
Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c
am: 0819ab21c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998
Change-Id: Ibdd64f5d67600e166ebde386cbdd8a127f30d7ce
2021-05-10 06:43:07 +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
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
Weng Su
5302ff6475
Merge "[Provider Model] Add progress bar to internet panel" into sc-dev am: 72c3debb0b
am: 1ab5ed70af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442219
Change-Id: I4539554e97789cb53b332ae9566eeb442b851d3b
2021-05-10 06:01:30 +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
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
9733bfa405
Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev am: 48535ffd29
am: 27449fb2a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456009
Change-Id: I213193025c134a65177f6b30bea98a95e3b10d08
2021-05-10 04:17:01 +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
afbb8905b6
Merge "Commit changes only when activity is closed" into sc-dev am: 257b3ec584
am: d0c043b0a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463203
Change-Id: I1110bd29bf044f86e2ad6cefc52a1b91c83aebe1
2021-05-10 03:23:41 +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
32829de55e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5c29b05ab3
-s ours am: 1b3330409b
-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: I725ca8c86106a5d3687c916024900e156addd05a
2021-05-09 21:59:16 +00:00
TreeHugger Robot
823de830a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e1aa1f04c0
-s ours am: 5d6b03e51c
-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: I410f93d70f378f0e829ce4c30cf2c03c6f90022e
2021-05-09 21:57:55 +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
f0d1544bd6
Build a bridge to control whether the graph is clickable or not am: d8d5335096
am: fd541575ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456008
Change-Id: Ibcc7629ed78bf345d8cc1cd917fa4329a066df90
2021-05-09 05:30:42 +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
a2cfc39b0d
Fix UI flashes issue when entering to the app in the cold start am: 5b27fd923a
am: a4641ab27d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456007
Change-Id: I16e587e890b7643465cbf040c38dd750a01ded8a
2021-05-09 04:45:44 +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
ee4eccf5a8
[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 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: I23d5fea45718eddb02e2fa0bb0fc80ea6485957e
2021-05-08 23:49:11 +00:00
Xin Li
6d919bb2c8
[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 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: I732f7e86bd1645732809969d2841f95dbab77562
2021-05-08 23:49:06 +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
fc0eebc86e
Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac
am: a5464f4438
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443640
Change-Id: Iaf4a5fd384eb7976b2de7b5c88381aff8bddcaa1
2021-05-08 16:35:26 +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