Bill Yi
d798e37a07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours am: f16b21ff25
-s ours am: 51709467ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: Ib8656a937d2148ca6cdb20395efee55b5365caaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:40:01 +00:00
tom hsu
213b3ce4af
[Panlingual] Improve and refactor revamped UI
...
- Remove useless file
- Make Icon be able to scroll up and down
Bug: 226350483
Test: local test
Change-Id: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
(cherry picked from commit ded10f8e24
)
Merged-In: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
2022-04-01 10:33:22 +08:00
TreeHugger Robot
d286b52223
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
am: 587dba5e1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: I7be92ca85e7fc28ff7923da65c4b1b15301f8e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:24:03 +00:00
Treehugger Robot
4440e7a067
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
am: caa0bbd931
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: I56e489c2867242dfc425aba6dea8896d903ab4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:16:00 +00:00
TreeHugger Robot
e18a842e90
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
am: 22233430fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: Ia77eee52b9995d9e4f43558efc683e6a2fecc43f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:12:16 +00:00
TreeHugger Robot
d63489c96d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-s ours am: 285c9c9807
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: I3ca72aa2389dbc139583bb4760e22e8001bbd6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:10:17 +00:00
Bill Yi
51709467ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours am: f16b21ff25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: I60ca605598356044bea7c1a156cd5f4954078f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:10:15 +00:00
Treehugger Robot
caa0bbd931
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
am: 3531a34760
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: Iffb14760e676a66d061f500a1e9fc383c2a317e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:01:14 +00:00
TreeHugger Robot
587dba5e1d
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: I80a8ed3418a0947e8377b66da1ab13a6c1b7e262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 02:00:18 +00:00
TreeHugger Robot
22233430fc
Merge "WiFi restricted connection when scan QR code" into tm-dev am: ad5acbdc23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17530223
Change-Id: Ida748419818b6d4e90c89027eca12af6e82cee14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:50:00 +00:00
TreeHugger Robot
806cea3017
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-s ours am: e845259c25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: I9696cd371fb312a886dbc1ce5322125fed19f7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:48:24 +00:00
Bill Yi
5c27a5d78e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours am: ff374ac1ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: Ic219dfa2bb92681acfe3f8c0e906b526befabd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:48:23 +00:00
TreeHugger Robot
285c9c9807
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: I9a4cb64c2b9b73614b3a169d53517f36ae4ee221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:47:12 +00:00
Bill Yi
f16b21ff25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: I70cbfa5479d40c6cf39e36658f2a280006dd25a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:47:07 +00:00
Treehugger Robot
3531a34760
Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409
Change-Id: Id3a72177089ca58c1e8e092220835dd3e5f41064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:44:08 +00:00
TreeHugger Robot
59068297b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2d30e67512
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17516530
Change-Id: I2c636a8b7a03d504b4ec6e55850aa7c9e2bb51c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:35:35 +00:00
Bill Yi
c8469e7a54
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80cccc92a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17516530
Change-Id: I30c3cb308188f19878f32cbc919f3521862da1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:35:16 +00:00
TreeHugger Robot
ad5acbdc23
Merge "WiFi restricted connection when scan QR code" into tm-dev
2022-04-01 01:28:56 +00:00
Treehugger Robot
f558fc27d9
Merge "Settings: Fix WifiSettings FC when rotating screen"
2022-04-01 01:23:47 +00:00
TreeHugger Robot
e845259c25
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 119dc79558
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: Icf0a372c390e93e38a9b51148d5aca52ee426340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:04:25 +00:00
Bill Yi
ff374ac1ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc9f99268a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17512541
Change-Id: I8a1f5ad3cf8c6adcae719c53c144232c5db3e354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 01:04:23 +00:00
TreeHugger Robot
119dc79558
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-01 00:38:03 +00:00
TreeHugger Robot
2d30e67512
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-01 00:37:17 +00:00
Weng Su
2088b4985d
WiFi restricted connection when scan QR code
...
- Use WifiEntry#canConnect() to determine if the network can be
connected.
- Add WiFi network but don't connect if WiFi restricted connection.
- See the result screenshot in b/203168943#comment16
Bug: 203168938
Bug: 203168943
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest
Change-Id: I06d1e832176e540ddd1adce8da46ef8659534ab7
2022-04-01 06:04:34 +08:00
Joshua Mccloskey
fc6df8dcfc
Merge "Updated UDFPS strings." into tm-dev am: ca7f2dbe4a
am: 6233cf518a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17454058
Change-Id: I8d6ed6f6bd56c387ed195bb680c2bac6e59f410a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 19:00:05 +00:00
Joshua Mccloskey
6233cf518a
Merge "Updated UDFPS strings." into tm-dev am: ca7f2dbe4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17454058
Change-Id: I1ccbc7f7c50f0a42ae2d107012f906a62401d731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:52:52 +00:00
Joshua Mccloskey
305b991353
Merge "Updated UDFPS strings." into tm-dev am: ca7f2dbe4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17454058
Change-Id: Ic6b54aa03f70e15c4d4cdcedeb0b644daae0bf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:52:45 +00:00
Joshua Mccloskey
ca7f2dbe4a
Merge "Updated UDFPS strings." into tm-dev
2022-03-31 18:47:51 +00:00
Quang Luong
c168c1d50e
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
am: 6ca8dd1b1a
am: 4cffe5c223
am: e8250cf1b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: I95e5830c7a6c6a31e4560490645bd85cd6b658e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:39:12 +00:00
Quang Luong
e8250cf1b5
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
am: 6ca8dd1b1a
am: 4cffe5c223
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: I6517dade5b9373191b768d0deaf77d03462adb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:24:11 +00:00
Quang Luong
7cd276af55
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
am: 6ca8dd1b1a
am: 4cffe5c223
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: I36a4c220cf25910d640ddb46b89ec465f7782133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:23:56 +00:00
Jason Hsu
0871157a0b
Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev am: a0eeda0d65
am: 55e78599f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321712
Change-Id: Iacde1fb07ceb8bc323e707e0577f5fa4ee68972e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:09:25 +00:00
Quang Luong
4cffe5c223
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
am: 6ca8dd1b1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: Iff78312fbc3045e09d251026756a5f41d0035b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 18:01:33 +00:00
Jason Hsu
55e78599f5
Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev am: a0eeda0d65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321712
Change-Id: I7efadf84aa13025b59346d61a42c546a47d093c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:46:01 +00:00
Jason Hsu
9519e55315
Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev am: a0eeda0d65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321712
Change-Id: I8c5c462cd1c78da69d2931d3cf82719e285d3118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:45:51 +00:00
Quang Luong
6ca8dd1b1a
Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482
Change-Id: I50e3649c21bb83ee9130fa98a71560fe261198a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 17:45:25 +00:00
Jason Hsu
a0eeda0d65
Merge "Extract inner helper from AccessibilitySettings to public" into tm-dev
2022-03-31 17:26:41 +00:00
jasonwshsu
f02c069f3d
Extract inner helper from AccessibilitySettings to public
...
* Need to be used in 'Connected device' page for hearing aid device
Bug: 225117933
Bug: 227172850
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RestrictedPreferenceHelperTest
Change-Id: Icda456aa9c7597dc113775d1359acb0a8430768c
2022-03-31 21:49:13 +08:00
danielwbhuang
3f608d608a
[automerger skipped] [Panlingual] Handle onLocaleSelected. am: 963abde2dc
am: 3a7a92b696
-s ours
...
am skip reason: Merged-In I20bc2e2349d0bad123661e0964a4e271dd319147 with SHA-1 963abde2dc
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518130
Change-Id: I16fc98a624626c70e20dcc12fe6397028a2f97a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 12:32:52 +00:00
danielwbhuang
3a7a92b696
[Panlingual] Handle onLocaleSelected. am: 963abde2dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518130
Change-Id: Ifde27e7a8e2f79e0507d994977f80f881f38b54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 12:17:58 +00:00
danielwbhuang
267d5b9b4d
[automerger skipped] [Panlingual] Handle onLocaleSelected. am: 963abde2dc
-s ours
...
am skip reason: Merged-In I20bc2e2349d0bad123661e0964a4e271dd319147 with SHA-1 19859b63c9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518130
Change-Id: I9de567b6cde64235711b7b51da74646edb94c057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 12:17:41 +00:00
danielwbhuang
963abde2dc
[Panlingual] Handle onLocaleSelected.
...
1. When a new locale is selected, onLocaleSelected(...) will get the LocaleInfo.
2. Set LocaleList to LocaleManager for apps.
3. Check isSystemLocale().
Bug: 223090738
Test: local test pass
Change-Id: I20bc2e2349d0bad123661e0964a4e271dd319147
Merged-In: I20bc2e2349d0bad123661e0964a4e271dd319147
2022-03-31 18:05:04 +08:00
Tom Hsu
840808c7c9
[automerger skipped] Merge "[Panlingual] Settings UI revamp - Navigation handling" into tm-dev am: 092fe80396
am: 765afa5689
-s ours
...
am skip reason: Merged-In Ied357b60c103f25540981cc0cb7abadb020f7995 with SHA-1 9acf3d7846
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518123
Change-Id: I247d8eda7d5cbed6aabb8f5b926de36a378803bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 09:11:47 +00:00
Tom Hsu
b07a37a627
[automerger skipped] Merge "[Panlingual] Revamp the panlingual UI in Settings." into tm-dev am: 7eb32dec44
am: 35efa01f13
-s ours
...
am skip reason: Merged-In Id01e93f3df32412c7323ca577a149009eb1862ad with SHA-1 9be043e750
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286350
Change-Id: Ife7feea6b740542d93672f3afcdb8812545ce063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 09:11:44 +00:00
Tom Hsu
ac04013fe9
[automerger skipped] Merge "[Panlingual] Settings UI revamp - Navigation handling" into tm-dev am: 092fe80396
-s ours
...
am skip reason: Merged-In Ied357b60c103f25540981cc0cb7abadb020f7995 with SHA-1 fbf8cde0fb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518123
Change-Id: I9460bc4bac7c5da8aa2809c26a234e1deb941bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 08:53:20 +00:00
danielwbhuang
a29363079e
[automerger skipped] [Panlingual] Settings UI revamp - Navigation handling am: 9acf3d7846
-s ours
...
am skip reason: Merged-In Ied357b60c103f25540981cc0cb7abadb020f7995 with SHA-1 fbf8cde0fb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518123
Change-Id: I0131939be0902f4d81c97e86f2c54cad865740fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 08:53:19 +00:00
Tom Hsu
1085880cce
[automerger skipped] Merge "[Panlingual] Revamp the panlingual UI in Settings." into tm-dev am: 7eb32dec44
-s ours
...
am skip reason: Merged-In Id01e93f3df32412c7323ca577a149009eb1862ad with SHA-1 6fc5bb64dc
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286350
Change-Id: I4732117fa615cd5067a0374e11f1e07d6728d339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 08:53:17 +00:00
tom hsu
5ec6d69eb4
[automerger skipped] [Panlingual] Revamp the panlingual UI in Settings. am: 9be043e750
-s ours
...
am skip reason: Merged-In Id01e93f3df32412c7323ca577a149009eb1862ad with SHA-1 6fc5bb64dc
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286350
Change-Id: I94bfff2e0a2e63227400ac458b28e424fecd2b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 08:53:16 +00:00
Tom Hsu
765afa5689
Merge "[Panlingual] Settings UI revamp - Navigation handling" into tm-dev am: 092fe80396
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518123
Change-Id: I9bc452b7706322aea070627c1930c3b30f7c0027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 08:52:28 +00:00
Tom Hsu
35efa01f13
Merge "[Panlingual] Revamp the panlingual UI in Settings." into tm-dev am: 7eb32dec44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286350
Change-Id: I02d5a5ac994b065b2a72dff33da9771396042b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 08:52:27 +00:00