PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,065 Commits 1 Branch 0 Tags
b69db35191624580043fe721a5441ac22d66760f
Commit Graph

92065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b69db35191 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31a2875c24 -s ours am: e0ce5276d6 -s ours am: a437108ebf -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: Ib549228d3b17ba3e4194cf60cbf00010f3a4ad4e
 2021-07-13 09:06:08 +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
0b44316adb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31a2875c24 -s ours am: 2df398e7ac -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: If6a15782b61d945c018cddd8f28e7a1d8ceedb64
 2021-07-13 08:47:38 +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
2df398e7ac [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: Id5ca02a9309ca0fbca55295026086756939da6aa
 2021-07-13 08:33:25 +00:00
TreeHugger Robot
31a2875c24 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-13 08:13:45 +00:00
TreeHugger Robot
23bf780529 Merge "[Settings] Fix RTL issue of Calls and SMS" 2021-07-13 07:14:49 +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
e2fad7d9f0 Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd am: 0cce02c985 am: 263c3eab44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210

Change-Id: I25d6e74a85363fc0725ad456aee6670d694459ab
 2021-07-13 06:46:14 +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
219e434fd4 Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd am: 9e0bb47c86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210

Change-Id: I3f42f8fe72814223af31198069a176d35ac8e6f7
 2021-07-13 06:29:45 +00:00
Rajeev Kumar
670b90ca57 Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d am: 2a5fb15097 am: 41af063858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350

Change-Id: Ie187cc0b6d5cd79e22e90abdb931e3507c84b45b
 2021-07-13 06:25:42 +00:00
Bonian Chen
9e0bb47c86 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: I90429c24c519e2a73ef9213e7126146a4b895d93
 2021-07-13 06:17:32 +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
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
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
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