PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,968 Commits 1 Branch 0 Tags
b8a4a10bcc8e66608dc20c42bed68c0e2e8e6ec9
Commit Graph

75968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
b8a4a10bcc Merge "[Testing] Use AndroidJUnit4 instead in SubscriptionUtilTest" am: 1adaa8ba27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343223

Change-Id: I7ae709b9aa7924f8e046350a2d2f6916f277b16a
 2020-08-17 23:48:15 +00:00
Kevin Chyn
2f1d380810 Update biometric onChallengeGenerated with frameworks/base am: 9ce9d3d539 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12280210

Change-Id: I274a004b7516bb961745a4e2b6b395638d2a657e
 2020-08-17 23:29:43 +00:00
Betty Chang
1adaa8ba27 Merge "[Testing] Use AndroidJUnit4 instead in SubscriptionUtilTest" 2020-08-17 10:46:30 +00:00
changbetty
57abc1f865 [Testing] Use AndroidJUnit4 instead in SubscriptionUtilTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Add spy context and get the SubscriptionManager and TelephonyManager
from the spy context

Bug: 163298785
Test: atest -c SubscriptionUtilTest
Change-Id: Iefcf29904c9c4475221c20318526ce48cb88a45a
 2020-08-17 11:57:22 +08:00
Kevin Chyn
9ce9d3d539 Update biometric onChallengeGenerated with frameworks/base 
Bug: 145978626
Test: Builds

Change-Id: If02497fa6462f1ff263aeb96cf0beed014fee328
 2020-08-16 11:48:13 -07:00
Jiashen Wang
4c92dc2ba4 Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: 4d00b8b57a am: e03d5ad5fb am: 9af90d3cf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I072c61b19a0271c759e88056168fbcda88f48c4d
 2020-08-15 16:36:15 +00:00
Jiashen Wang
1365c2aade [automerger skipped] Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df am: 8e939b0dfc -s ours am: f25fdedb1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I593a3247278fccd932de1d0a921e2fa1f91c4883
 2020-08-15 16:36:03 +00:00
Jiashen Wang
9af90d3cf4 Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: 4d00b8b57a am: e03d5ad5fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Ia494e588b5cdcf00b93f195e9e6ff2d31733e551
 2020-08-15 16:23:16 +00:00
Jiashen Wang
f25fdedb1e [automerger skipped] Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df am: 8e939b0dfc -s ours 
am skip reason: skipped by user jiashenwang

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I2ec270b1011ece8ce1e0f2690555c2339a45d091
 2020-08-15 16:23:00 +00:00
Jiashen Wang
e03d5ad5fb Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: 4d00b8b57a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Ia300e8e5e31b868cfaeee342524832b6ebddddc8
 2020-08-15 13:03:45 +00:00
Jiashen Wang
8e939b0dfc Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I549082280f8b9a49f75333f9327b92ea679caa61
 2020-08-15 13:03:32 +00:00
Jiashen Wang
4d00b8b57a Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I987fd968ff755e88942bd69409b59996a08c972a
 2020-08-15 12:53:07 +00:00
Jiashen Wang
e50cda81df Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Id36dbea5606b1775c83b3d6a53880a5f60ab715b
 2020-08-15 12:52:55 +00:00
Jiashen Wang
bbcd54dd63 Adding dialogs to warn users about the potential eSIM erase failure 
eUICC card could potential in the card error state and all the eSIM
operations will fail which could be fixed by a reboot. Thus, we need to
pop up a dialog to inform users that their eSIM profiles cannot be
erased successfully.

Bug: 163078560
Test: Manually tested by mocking the eUICC card error state.
Mock: https://docs.google.com/presentation/d/1AVNXxPbieTX1KmoewG4mo3xWPnEZyba_h9rPcwHHcr8/edit#slide=id.p

Change-Id: I102fb2de889e08554f525f2cbe1528bb9a37afd7
 2020-08-15 05:31:49 +00:00
Yi-Ling Chuang
7f8c8cea2d [automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: f046aa5beb am: ecf25c02f0 -s ours am: 297fc4b9f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I050a8ec41f88ae4f3621004558515202240b2a26
 2020-08-15 02:53:16 +00:00
Yi-Ling Chuang
c5dbf03b08 [automerger skipped] [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 am: c248da2974 am: f9b6dd0fe7 -s ours am: 41e4d66dfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I0e8119af2ecb85d6213d0b0fae320da1d9c1254f
 2020-08-15 02:53:12 +00:00
Automerger Merge Worker
c6a3412701 Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp am: fa9cc7830a am: a881106238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: Ia9bd76d00938b615c7baf36d9faf2f84edaa9ee7
 2020-08-15 02:52:59 +00:00
Yi-Ling Chuang
4ba9899087 [automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: 4d6f8bf34d am: 09b5db829e -s ours am: 2a0b09893f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I9f0285dc246a9bdd79c20f7670c77067b8d086d2
 2020-08-15 02:52:55 +00:00
Yi-Ling Chuang
62c770b16d [automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: ec05383478 am: 50349a9543 -s ours am: d07f4e59ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I660d70b6ccd7c1aefc620592014eac2dec6e8159
 2020-08-15 02:52:36 +00:00
Jason Chiu
4af087883d [automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 4113bf12d0 am: 1dfb8c8644 -s ours am: 70c298e9cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I2997c4c1ca545bd9acad7a552f384551f3d50eac
 2020-08-15 02:52:33 +00:00
Yi-Ling Chuang
33d20782ac [automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: f07366ff12 am: 68e80545b0 -s ours am: 24328feca3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ifffdba024c587936dea7001688ec4b19738d4e93
 2020-08-15 02:52:16 +00:00
Jason Chiu
9d0abd684f [automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 68173c1343 am: 0f87cd00a1 -s ours am: ac76b763fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I7afeb0ef7eea928cf14a56ee714e121c970bfbdc
 2020-08-15 02:52:12 +00:00
Yi-Ling Chuang
297fc4b9f9 [automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: f046aa5beb am: ecf25c02f0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I2b7e845d99bd0e46d124d1d9508ca5aaded8002e
 2020-08-15 02:33:33 +00:00
Yi-Ling Chuang
41e4d66dfd [automerger skipped] [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 am: c248da2974 am: f9b6dd0fe7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I7af9b8050d0081fc823d4c80568181735f75f4aa
 2020-08-15 02:33:31 +00:00
Automerger Merge Worker
a881106238 Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp am: fa9cc7830a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I14200b1599a4fb6a7f5d94c21f90506d9403e12f
 2020-08-15 02:33:19 +00:00
Yi-Ling Chuang
2a0b09893f [automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: 4d6f8bf34d am: 09b5db829e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I390cd9424e39426f7022968f716e1d37e5f80f49
 2020-08-15 02:33:17 +00:00
Yi-Ling Chuang
d07f4e59ec [automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: ec05383478 am: 50349a9543 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ibed04dfad384828c997efc54b5d247f296d834ce
 2020-08-15 02:32:56 +00:00
Jason Chiu
70c298e9cd [automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 4113bf12d0 am: 1dfb8c8644 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ie675ec09705d7a010ab6abb114f40c037efac10e
 2020-08-15 02:32:54 +00:00
Yi-Ling Chuang
24328feca3 [automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: f07366ff12 am: 68e80545b0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I2f7c4737d930fea7a800b79ce10b65c8c477be61
 2020-08-15 02:32:41 +00:00
Jason Chiu
ac76b763fa [automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 68173c1343 am: 0f87cd00a1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ie37a13a666fae4f956ab447204fd06edc6146538
 2020-08-15 02:32:39 +00:00
Yi-Ling Chuang
ecf25c02f0 Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: f046aa5beb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: Iff0e8b936c7268c8622e8a7079a27d8a0e5be4dd
 2020-08-15 02:20:48 +00:00
Yi-Ling Chuang
f9b6dd0fe7 [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 am: c248da2974 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I6988e9ab91ae2cf15e95702c438d4c0529317095
 2020-08-15 02:20:46 +00:00
Automerger Merge Worker
fa9cc7830a Merge changes from topic "am-e6033234b46e499e83aea82567136c31" into rvc-qpr-dev-plus-aosp 
* changes:
  Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: 4d6f8bf34d
  [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 am: 631465df31
 2020-08-15 02:20:40 +00:00
Yi-Ling Chuang
09b5db829e Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 am: 4d6f8bf34d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: Ie5cea9ddee70dfbe48de0ce995ee6f4a1bcf36bc
 2020-08-15 02:20:35 +00:00
Yi-Ling Chuang
50349a9543 Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: ec05383478 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I45f3140b7b3beba80536ca9779c33479a29b6a7d
 2020-08-15 02:20:34 +00:00
Yi-Ling Chuang
e50265cb43 [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 am: 631465df31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I72029cb7956edadd3faef36de6b0e81176575985
 2020-08-15 02:20:32 +00:00
Jason Chiu
1dfb8c8644 [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 4113bf12d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I206e049ba2e6e3652b6a316d269d6cf37af4c0b3
 2020-08-15 02:20:30 +00:00
Yi-Ling Chuang
68e80545b0 Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed am: f07366ff12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Id6b9042fe823441588be96689692fe47fbbde049
 2020-08-15 02:20:15 +00:00
Jason Chiu
0f87cd00a1 [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 am: 68173c1343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ib6bcff33b0dc7af2935e937f600cb6832f48febf
 2020-08-15 02:20:13 +00:00
Yi-Ling Chuang
f046aa5beb Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I4db8cc713daaa14566b1f44dea0aab1aa01c8ce5
 2020-08-15 02:08:58 +00:00
Yi-Ling Chuang
c248da2974 [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I76c77c66be5da635571f876d9b76906f789e8472
 2020-08-15 02:08:57 +00:00
Yi-Ling Chuang
4d6f8bf34d Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: I33d8794e09209d66eb4c9a53a903d18f44ceddbb
 2020-08-15 02:08:55 +00:00
Yi-Ling Chuang
631465df31 [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78bf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231

Change-Id: Iefb77041715dba0cc2a19210e1353f935e25a8a8
 2020-08-15 02:08:53 +00:00
Yi-Ling Chuang
ec05383478 Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I7b1bb3f970e12b67608dc2d734a2906099716804
 2020-08-15 02:08:44 +00:00
Jason Chiu
4113bf12d0 [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Iaf3bcd4f531d7a82aa78c5eba12b44192e3b7df8
 2020-08-15 02:08:43 +00:00
Yi-Ling Chuang
f07366ff12 Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: I93636856e4cbe4e764c7f890ea0e05c810086827
 2020-08-15 02:08:38 +00:00
Jason Chiu
68173c1343 [DO NOT MERGE] Update contextual cards display mechanism am: b824187524 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ia3f637ea89d7209cfdbc1a97238e4bfb6d66d77f
 2020-08-15 02:08:34 +00:00
Yi-Ling Chuang
8c3987b907 Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev 2020-08-15 01:56:27 +00:00
Yi-Ling Chuang
51f80cb3ed Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev 2020-08-15 01:56:05 +00:00
Lyn Han
275c7cd35d Merge "Hide conversation bubble switch if app bubbles are off" am: 354e25c125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363009

Change-Id: I4e5c9bab127db3529fb42ed788b10e5c5bafeb10
 2020-08-14 20:33:41 +00:00