Android Build Coastguard Worker
2bc33720e6
Snap for 7550575 from bef076df47
to sc-release
...
Change-Id: I9bb547bd5416529d2ab8f79d574679f269dccd5c
2021-07-15 01:08:42 +00:00
Beth Thibodeau
647b3ef070
Remove lockdown toggle
...
This button will be on by default now, so remove the switch
Bug: 185618694
Test: build
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Iecbeb590a5b750ec2fcf9c31fece5814241200b1
2021-07-14 19:39:30 -04:00
Bill Yi
4dc320540d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia76dcfef58e0d6c025e4b93e9fda413fc26216c3
2021-07-14 22:04:54 +00:00
TreeHugger Robot
000c7a897b
Merge "Fix switch listener on app notif page" into sc-dev am: bef076df47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15273047
Change-Id: I7725f5c5dff01e1840072518f21e0ae661cd9238
2021-07-14 15:52:07 +00:00
TreeHugger Robot
bef076df47
Merge "Fix switch listener on app notif page" into sc-dev
2021-07-14 15:41:04 +00:00
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
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
b537d169b4
Update OWNERS for package settings > accessibility
...
Bug: 193589847
Test: Manual
Change-Id: I57d27181d83cf47df9f4d0d359a2d76df3e3c91a
2021-07-14 14:16:35 +08: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
Android Build Coastguard Worker
28518c434f
Snap for 7546601 from e796b8bf6e
to sc-release
...
Change-Id: I51b5bf731cad3f26b5a0eb0700ebb5190e953391
2021-07-14 01:09:16 +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
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
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
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
Bonian Chen
9c1e8b7ccd
Merge "[Settings] Hide subscriptions not existed within device" into sc-dev
2021-07-13 06:08:17 +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
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
Android Build Coastguard Worker
d589c913dc
Snap for 7542710 from 5ab7e41f02
to sc-release
...
Change-Id: I8acb5fa81a1f73465850de09b86260b1a914d1ff
2021-07-13 01:09:55 +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
Curtis Belmonte
68c12f2e04
Add "eyes open" setting message to face enroll intro
...
Adds an additional message about the "Require eyes to be open" setting
for Face Unlock to the intro/consent screen of enrollment, gated by a
config flag.
Test: Manual
Bug: 192272785
Change-Id: Idcd2395a290b74f4578898fdfebd05b81cd74075
2021-07-12 17:05:45 -07:00
Bill Yi
7976c5bc51
Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE
...
Merged-In: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Change-Id: I0f793ed1ea64127903c6dc906c5afa1db15fff48
2021-07-12 11:08:29 -07:00
Bill Yi
799b80f9d7
[automerger skipped] Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 275dc390bd
-s ours
...
am skip reason: Merged-In I2b0706fc636af827e9a7f76ca00c99653d569dbf with SHA-1 7639158022
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15257241
Change-Id: Ie1b18e903e1246e7020c6d3528f936b582347637
2021-07-12 13:27:14 +00:00
Bill Yi
275dc390bd
Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
2021-07-12 13:14:39 +00:00
Treehugger Robot
b664dbe93f
Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8
am: 476c3dc62a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584
Change-Id: I53b5765f78098e466379454d228dda47cc007aa9
2021-07-12 11:01:58 +00:00
Treehugger Robot
476c3dc62a
Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584
Change-Id: I48ab5a9d8bd431e6e9854d9f3c36373f95118cf6
2021-07-12 10:49:01 +00:00
TreeHugger Robot
e39365282c
Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881
Change-Id: I4f3a2d73374a9e51ea1da147d734b12e96767e0b
2021-07-12 10:48:08 +00:00
TreeHugger Robot
5ab7e41f02
Merge "[Settings] Correct some typo" into sc-dev
2021-07-12 10:39:07 +00:00
Treehugger Robot
8dd6ce02d8
Merge "Revise strings for the NFC developer option"
2021-07-12 10:38:43 +00:00
Bonian Chen
a239a6c53a
[Settings] Hide subscriptions not existed within device
...
For non-active subscriptions, the one inserted in slot
but turned off need to be visible to the user. However,
the one un-plugged need to be invisble.
Since SubscriptionUtil#getSelectableSubscriptionInfoList() didn't cover all the cases required. Create this one to fit into the criteria required here.
Note: subscriptions with same group UUID will be displayed seperately.
Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
(cherry picked from commit 75f1450bbf
)
(cherry picked from commit 0726f263a8
)
2021-07-12 17:32:59 +08:00
Jack Yu
cfb0bbc0d0
Revise strings for the NFC developer option
...
Bug: 187083201
Test: build pass
Change-Id: Id90627235dbdb714d13a78b61826bafeb9f80360
2021-07-12 16:39:22 +08:00
Bill Yi
323420f40d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours am: 2fe6e382d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256205
Change-Id: Ibdc3394f631c21cd9b390d61b657ff89fb53b824
2021-07-12 07:54:16 +00:00
Bill Yi
2fe6e382d7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256205
Change-Id: I2091d9fbae8ee41c013401190e11c877c7fba447
2021-07-12 07:41:29 +00:00
Bill Yi
b91ee37910
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39
-s ours am: bf4b93129f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256323
Change-Id: I42240b4866647a6430aa32aacc6175b36d7be4c2
2021-07-12 07:15:24 +00:00
Bill Yi
bf4b93129f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256323
Change-Id: I877fc8715242c4056cdf45a955bbc5f8cf68b93a
2021-07-12 07:00:51 +00:00
Bill Yi
e6458604bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15256574
Change-Id: Ib6ab20ff1121080219c04e13caa9208e4d23b005
2021-07-12 06:55:49 +00:00
Bill Yi
2c5d2dfc74
Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I2b0706fc636af827e9a7f76ca00c99653d569dbf
Change-Id: I47f15d872a0adcafe26fa349b3d0ecdcdc061872
2021-07-11 22:43:41 -07:00