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
Rajeev Kumar
aada2886f6
Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d
am: a0065f01d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350
Change-Id: I240c8c8a5f9280040dd621dfb3cb3d66197f2bb4
2021-07-13 06:08:43 +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
a0065f01d6
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: Ib830cfd437b998050c63f693cf824b9071097df9
2021-07-13 05:49:10 +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
Zoey Chen
54bd206fbc
[Settings] Fix RTL issue of Calls and SMS
...
Screenshot: https://screenshot.googleplex.com/9BqEh99vz7xp2g4.png
Bug: 189300799
Test: make
Change-Id: I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa
2021-07-13 13:39:52 +08:00
Rajeev Kumar
6311d1fe0d
Merge "Enable hibernation by default for Settings" into sc-dev
2021-07-13 05:35:34 +00:00
Bill Yi
1fae7f3fdc
[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: 9b1879135c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1763547
Change-Id: If6852191596cf55355e18efc025cb24de7b5e7ea
2021-07-13 01:57:05 +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
af75689866
Merge "Update the preview image of caption preference fragment." into sc-v2-dev am: 00c2fb2a4a
am: 1910983174
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221070
Change-Id: I7deb6a77708f25de31578774be050edb4f66bf80
2021-07-13 00:46:53 +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
PETER LIANG
00c2fb2a4a
Merge "Update the preview image of caption preference fragment." into sc-v2-dev
2021-07-13 00:23:30 +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
Daniel Chapin
e7cb2762f9
Revert "Rename Enhanced MAC Randomization to Non-Persistent"
...
Revert submission 15050857-RenameEnhancedMac
Reason for revert: Droidfood blocking Bug: 193375403
Reverted Changes:
I5d647a666:Rename Enhanced MAC Randomization to Non-Persisten...
I48a326f98:Update old terminology for Non-persistent Mac Rand...
Change-Id: Ic6ff02dad064f8d8c7dbaab51c658da12a4d8555
2021-07-12 22:54:21 +00: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
71971ec4ef
[automerger skipped] Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 275dc390bd
-s ours am: 799b80f9d7
-s ours am: f47a8c16c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15257241
Change-Id: I4d010b748e2388bc2f6456ae3738390758448f1c
2021-07-12 13:56:27 +00:00
Bill Yi
f47a8c16c0
[automerger skipped] Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 275dc390bd
-s ours am: 799b80f9d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15257241
Change-Id: Ie4cdf18a0c58f48c7dbea230eb6ae99360ba7786
2021-07-12 13:42:06 +00: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
0e371c63ae
Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8
am: 476c3dc62a
am: b664dbe93f
am: bc08889feb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584
Change-Id: I7d2cf24adabc90a1446be0f261888c24b77b494b
2021-07-12 11:10:41 +00:00
TreeHugger Robot
4dc0778799
Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02
am: e39365282c
am: 81da0b253f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881
Change-Id: Ib336c2bbfeaa8613a42cbd57abf5ca8c4dbeb6a1
2021-07-12 11:10:35 +00:00
TreeHugger Robot
b7ef5c5bbc
Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02
am: 04ab26b286
am: e47237f563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881
Change-Id: I182da00abf21afbb90506226990d258161a0690e
2021-07-12 11:10:29 +00:00
Treehugger Robot
bc08889feb
Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8
am: 476c3dc62a
am: b664dbe93f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584
Change-Id: Ic56026cffaa57fa4cc8a66c65f34ac833e30a624
2021-07-12 11:02:20 +00:00
TreeHugger Robot
81da0b253f
Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02
am: e39365282c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881
Change-Id: I2d3db0c25748706a9b2fca75f6e646972a62f99c
2021-07-12 11:02:10 +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
e47237f563
Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02
am: 04ab26b286
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881
Change-Id: Ifcf7e6ac5440bc12fc3e441e0f3fff848f0a81ba
2021-07-12 11:01:44 +00:00
TreeHugger Robot
853c37c0e4
Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02
am: 1faaefee9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881
Change-Id: I8fb1895d00438d21cb72cdf6483c778149653b02
2021-07-12 11:01:19 +00:00
TreeHugger Robot
04ab26b286
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: I5332bed652128641d5cb23678a1336f6ac5aa3a9
2021-07-12 10:49:06 +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
1faaefee9c
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: I50899d08d1e6ed99987adaa6f21f65f0d0f198c6
2021-07-12 10:48:12 +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
Bonian Chen
5d57ed1d51
Merge "[Settings] Rollback group UUID merging in SIM settings"
2021-07-12 08:45:58 +00: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
c22fc19195
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours am: 2fe6e382d7
-s ours am: 323420f40d
-s ours am: 4e1cd46eb7
-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: Icfc34b96d53beeb2dcaeb77a5e5c98a1ea0179c4
2021-07-12 08:24:57 +00:00
Bill Yi
7f6e4f7d55
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours am: 2fe6e382d7
-s ours am: 51db20e4bb
-s ours am: 143e739a87
-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: I86d40190561a646ab9b18687c67e6adc3fdc06b8
2021-07-12 08:24:45 +00:00
Bill Yi
4e1cd46eb7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours am: 2fe6e382d7
-s ours am: 323420f40d
-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: I495a3d26110103586ccd252c57126573b3242f65
2021-07-12 08:08:45 +00:00
Bill Yi
143e739a87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours am: 2fe6e382d7
-s ours am: 51db20e4bb
-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: I1d2fbfcc8cc7f09133020daf02154da325eb3d17
2021-07-12 08:08:20 +00:00
Bill Yi
cf693a3301
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba
-s ours am: 2fe6e382d7
-s ours am: 4a0edbcc55
-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: Iae686755d0fe16c6a919801c7830fed3034dac96
2021-07-12 08:07:48 +00:00
Bill Yi
a07f53af42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39
-s ours am: bf4b93129f
-s ours am: 6306ac8576
-s ours am: 7d111e9b0b
-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: Ic75227ca8db294090911c3cac6ae91f129a89d60
2021-07-12 07:59:23 +00:00
Bill Yi
51db20e4bb
[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: I74a1eb0762a40e2406f445d1a3e104356fdbf5b5
2021-07-12 07:55:17 +00:00
Bill Yi
4a0edbcc55
[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: I7b8bc9227bdce08c94ac23d0cced402add66f5b2
2021-07-12 07:54:24 +00: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