PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,822 Commits 1 Branch 0 Tags
334763b5df1ba3a00db1edf51c69d17c63eac416
Commit Graph

85822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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