SongFerng Wang
9bfa6c19d0
Merge "Change the condition for showing "no connection"" into sc-dev am: 7429fd1315
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270340
Change-Id: I61b5feed494b241832062d461634fa3f9fefd5e3
2021-07-14 14:53:57 +00:00
SongFerng Wang
7429fd1315
Merge "Change the condition for showing "no connection"" into sc-dev
2021-07-14 14:38:00 +00:00
Julia Reynolds
e41c89da2a
Fix switch listener on app notif page
...
Test: RoboTests, manually change setting
Fixes: 193442605
Change-Id: Ie93469479e252811921a6451853b073dadb0d0a1
2021-07-14 10:31:30 -04:00
Weng Su
5a916eaaf9
Fix the NPE issue in the Internet Settings
...
- Missing to remove the mRemoveLoadingRunnable in the onStop() function, which will cause the callback to run after the fragment is destroyed and encounter this NPE issue.
Bug: 193405782
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I48b85173db1e6689dd056ba71f2fac776ffabbc9
2021-07-14 14:27:39 +00:00
Menghan Li
e8cba63525
Merge "Provides TC ID for accessibility framework feature for "about" and "learn more" part" into sc-v2-dev am: 7f907d35cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175506
Change-Id: Ie28863b4fe41b5d4c4e83c541be546aab13b3f68
2021-07-14 11:59:46 +00:00
Menghan Li
7f907d35cd
Merge "Provides TC ID for accessibility framework feature for "about" and "learn more" part" into sc-v2-dev
2021-07-14 11:48:24 +00:00
Menghan Li
45a8616a55
Merge "Update OWNERS for package settings > accessibility" am: f36c2bc0a4 am: be1e8a077b am: a8c91cd5c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1765529
Change-Id: I4809783467ed50ba86aee39e2de596aed1ad1360
2021-07-14 10:21:39 +00:00
Menghan Li
a8c91cd5c3
Merge "Update OWNERS for package settings > accessibility" am: f36c2bc0a4 am: be1e8a077b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1765529
Change-Id: I8eae86bc892cd045ee8d4c01cbbcc493dca85f71
2021-07-14 10:09:56 +00:00
Menghan Li
be1e8a077b
Merge "Update OWNERS for package settings > accessibility" am: f36c2bc0a4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1765529
Change-Id: Ife618f059ab34b3df08c51b52629a83c6a4c0426
2021-07-14 09:55:44 +00:00
Menghan Li
f36c2bc0a4
Merge "Update OWNERS for package settings > accessibility"
2021-07-14 09:41:41 +00:00
menghanli
bae720ffc3
Provides TC ID for accessibility framework feature for "about" and "learn more" part
...
Goal: Improve readability which is a bit difficult because of string concatenation for accurate translation.
Root cause: In some locales, framework features name would be a word rather than a product name. Hence it need to be in the different position in a sentence.
Solution: Use whole sentence to translate instead of concatenating the string could solve this issue.
Bug: 185478543
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityFooterPreferenceControllerTest
Change-Id: Id198805329be9c773df87f38a074ae956e4d0cdb
2021-07-14 15:15:48 +08:00
Bill Yi
dd49aa32cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc7e4bcd46 -s ours am: 9a36b0ce08 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15280026
Change-Id: Ib5a84d973a929dc2da3108416f0900940134aa1b
2021-07-14 06:30:56 +00:00
Bill Yi
03bb1fd9e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc7e4bcd46 -s ours am: 65d3563e02 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15280026
Change-Id: I2dd52556fa6846bfc876edbb87af653ec52f1223
2021-07-14 06:30:32 +00:00
menghanli
b537d169b4
Update OWNERS for package settings > accessibility
...
Bug: 193589847
Test: Manual
Change-Id: I57d27181d83cf47df9f4d0d359a2d76df3e3c91a
2021-07-14 14:16:35 +08:00
Bill Yi
9a36b0ce08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc7e4bcd46 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15280026
Change-Id: I2fc0f133bd1a6a4683b43791cc93c35d92492630
2021-07-14 06:15:18 +00:00
Bill Yi
65d3563e02
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc7e4bcd46 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15280026
Change-Id: Ic9989c714272e7cb53aa38b7d367996ee95e93c5
2021-07-14 06:14:26 +00:00
SongFerngWang
5f8f44c720
Change the condition for showing "no connection"
...
The "no connection" should be shown in no data cell connection.
Bug: 193273081
Test: atest passed
- SubscriptionsPreferenceControllerTest.java
- ProviderModelSliceHelperTest.java
- ProviderModelSliceTest.java
- NetworkProviderWorkerTest.java
Change-Id: Ied8a34d13d4bfc81e9136e05ba41cbb4233c9ad8
2021-07-14 02:49:36 +00:00
Bill Yi
bc7e4bcd46
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2e1daee1d28291d142e05b2f4e4d670de47ff0b9
2021-07-14 02:44:20 +00:00
Curtis Belmonte
334763b5df
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e am: 9683efd43f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510
Change-Id: I9bcb220155f81e8240df250645ed210899ce3e9c
2021-07-13 17:13:03 +00:00
Bonian Chen
2efae278b3
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e am: d0fabb37df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I23f24b7bd9b20cd8c4687421f52c14373ee2d39b
2021-07-13 17:12:58 +00:00
TreeHugger Robot
192500761e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31a2875c24 -s ours am: e8bd574734 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15267198
Change-Id: I2d7ba014a52fab4e91ed935d0ca6d67d062be5d5
2021-07-13 17:12:41 +00:00
Bonian Chen
e7619ce160
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd am: 14e3cf37f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210
Change-Id: I788054e6f7979675064563a28a08538a6f8edc40
2021-07-13 17:12:38 +00:00
Rajeev Kumar
95bad283de
Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d am: 21d1d772a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350
Change-Id: I637f9ad477866b92963b3d9591dc612a18c5f702
2021-07-13 17:12:17 +00:00
Curtis Belmonte
f0aadce0d6
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e am: b7c2a07117
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510
Change-Id: I609f5f3264ddb862ab0d19fb7ba36494d0f87f94
2021-07-13 17:01:01 +00:00
Curtis Belmonte
9683efd43f
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510
Change-Id: I2991e2efc7f0ecc56c8b34ed6ab8bbb42e8d22a3
2021-07-13 16:46:51 +00:00
Curtis Belmonte
b7c2a07117
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510
Change-Id: I68d7b957f9910d2328dbec028ee292a17723ed7a
2021-07-13 16:45:24 +00:00
Curtis Belmonte
e796b8bf6e
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev
2021-07-13 16:36:53 +00:00
Bonian Chen
0a21b821ac
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e am: d72cf9a10b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I2e5e842cb54419ccda06e87d807d8b0ee03959ce
2021-07-13 15:15:40 +00:00
Bonian Chen
d0fabb37df
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I3d36d901fe95e9f4e5ab09c8f1cbe606dc7427df
2021-07-13 14:58:00 +00:00
Bonian Chen
d72cf9a10b
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I370e04ab8c7ebcda3ef40c3b858b2c24da9d9d10
2021-07-13 14:57:29 +00:00
Bonian Chen
92e82aa07e
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev
2021-07-13 14:40:39 +00:00
TreeHugger Robot
a437108ebf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31a2875c24 -s ours am: e0ce5276d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15267198
Change-Id: Ib037f400da0f607ded0ec0895d5f6cf441abbccc
2021-07-13 08:48:12 +00:00
TreeHugger Robot
e8bd574734
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31a2875c24 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15267198
Change-Id: Ie746e465b06be88d00f40c1eee17c0be93aef5bf
2021-07-13 08:34:47 +00:00
TreeHugger Robot
e0ce5276d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31a2875c24 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15267198
Change-Id: I7d2d06291cb5316400c6c2eb6df7f05c7dffe496
2021-07-13 08:33:44 +00:00
TreeHugger Robot
31a2875c24
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-13 08:13:45 +00:00
Bonian Chen
83b2253048
[Settings] Settings within each SIM not been displayed to the user
...
The display of content is in majority depending on the callback result
of SIM card (in order to display the content).
However, to reduce the number of access of SubscriptionManager and
improve performance, a proxy has been design in between to reduce the
traffic and the latency required.
Within this situation, content didn't get displayed when Activity get
restarted since Proxy avoid to reduce the traffic through reducing the
callback to the Activity and even not generating request for update when
Activity resume.
Bug: 188982508
Test: local & unit test
Change-Id: Ia3b946a853f87a469ce07a398f3811f605d38f1d
2021-07-13 06:58:10 +00:00
Bill Yi
4e7a021a3f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1907d2b0f31200d7a55ab9b8e4f305e031428f93
2021-07-13 06:56:33 +00:00
Bonian Chen
263c3eab44
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd am: 0cce02c985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210
Change-Id: Iba5db461202a139d583f122bd4ef5048c0e20085
2021-07-13 06:30:35 +00:00
Bonian Chen
14e3cf37f7
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210
Change-Id: I17ab0779c169ec63959325a752abe9f20151155e
2021-07-13 06:21:28 +00:00
Bonian Chen
0cce02c985
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210
Change-Id: Ic019f1fb87a4f37c547c16aa6fb5189d108b3ff0
2021-07-13 06:17:04 +00:00
Rajeev Kumar
41af063858
Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d am: 2a5fb15097
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350
Change-Id: I09b4e8d3c90d2c4f89348bae948cb069ea721ec5
2021-07-13 06:09:09 +00:00
Bonian Chen
9c1e8b7ccd
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev
2021-07-13 06:08:17 +00:00
Rajeev Kumar
21d1d772a2
Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350
Change-Id: Idf6f326627419c2952d3b14dbc61c69ffb640e7d
2021-07-13 05:49:51 +00:00
Rajeev Kumar
2a5fb15097
Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350
Change-Id: Ia9fa607e0a9fe4cba4d425a634659676e6af09c6
2021-07-13 05:48:59 +00:00
Rajeev Kumar
6311d1fe0d
Merge "Enable hibernation by default for Settings" into sc-dev
2021-07-13 05:35:34 +00:00
Bill Yi
9b1879135c
[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6 -s ours am: 4cc5d4371e -s ours am: d32e536a2c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1763547
Change-Id: Ia2387998ee285fd62a9c2454319c0875175b69c7
2021-07-13 01:39:28 +00:00
Bill Yi
d32e536a2c
[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6 -s ours am: 4cc5d4371e -s ours
...
am skip reason: Merged-In Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c with SHA-1 4909b81006 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1763547
Change-Id: Ib6641264f7b7f664fbbba85207f351e368b014a0
2021-07-13 01:21:32 +00:00
Bill Yi
4cc5d4371e
[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6 -s ours
...
am skip reason: Merged-In Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c with SHA-1 4909b81006 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1763547
Change-Id: Ib6d3045e956672a1832742b1de90f8d000543c4e
2021-07-13 01:02:57 +00:00
Bill Yi
e36e5876d6
Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE"
2021-07-13 00:48:38 +00:00
PETER LIANG
1910983174
Merge "Update the preview image of caption preference fragment." into sc-v2-dev am: 00c2fb2a4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221070
Change-Id: Id02ecb6d4533e0864c71c22a2fcf9016ce349c92
2021-07-13 00:34:25 +00:00