summaryrefslogtreecommitdiff
path: root/res
AgeCommit message (Collapse)Author
2018-03-02Import translations. DO NOT MERGEBill Yi
Change-Id: Ic1b8baf4364792b12e374161acbb986f1edbed86 Auto-generated-cl: translation import
2018-02-27Update the button layouts and colors of StkInputActivityKenji Soutome
The color of the positive buttons shall be changed to teal and the flat button style shall be applied to the negative buttons. Bug: 67083833 Test: Manually checked the updated OK/CANCEL layout and YES/NO layout Change-Id: I6bce367089e5544cf9f92d58b34390ce2a3ab5ba
2018-01-27Import translations. DO NOT MERGEBill Yi
Change-Id: I9e8d0b0d11950eed6694bc58775b6812c3a5c278 Auto-generated-cl: translation import
2017-12-21Merge "The activity should not cover the background of the dialogs" am: ↵Jordan Liu
e332eb0610 am: 3f2beacf3d am: 7f6309695b Change-Id: I406b0c74aca1738eb16cf40932b3cad6e8a0be85
2017-12-20Merge "The activity should not cover the background of the dialogs" am: ↵Jordan Liu
e332eb0610 am: 3f2beacf3d Change-Id: I8b8aba9f3f89987b5556b682e56285aeebbe34ed
2017-12-20Merge "The activity should not cover the background of the dialogs"android-wear-8.0.0_r1Jordan Liu
2017-12-07Merge "Display the cancel button on the input screen" am: 5288f6cfb5 am: ↵Jordan Liu
9252f028f5 am: 62ed084c74 Change-Id: I5de8497f5034e5fbff80b30f00d7807e7db809b0
2017-12-06Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
2017-12-06Merge "Display the cancel button on the input screen" am: 5288f6cfb5Jordan Liu
am: 9252f028f5 Change-Id: I5b1de4b6f2f80dd01d1c6494ff33a9692daa38e6
2017-12-06Merge "Display the cancel button on the input screen"Jordan Liu
am: 5288f6cfb5 Change-Id: I662fba9f1b00c4db9009e824950d067d7282508a
2017-12-05Display the cancel button on the input screenTakanori Nakano
It is highly recommended to display the cancel button in addition to the OK button on the input screen according to GSMA PDATA.12 - SIM Toolkit Device Requirements to improve Mobile Connect Customer Experience. The result code shall be 0x10 - Proactive UICC session terminated by the user. Bug: 67083833 Test: Confirmed that the cancel button is added and works as expected. Change-Id: Ifd73a970a9be19b1c064887be39fe813fa0ca1a5
2017-11-06resolve merge conflicts of e17c94c to oc-mr1-dev-plus-aospXin Li
Test: I solemnly swear I tested this conflict resolution. Change-Id: Iaacf9d494af871b24d6348a460065104a8a43f3e
2017-11-02Merge commit '513dfe9fd0e341635bdca483a3ec6dac5f4c58ad' fromXin Li
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master Change-Id: I9f07d8d3de4fbb4138e49a212d22b0a1de949dda
2017-10-30Merge "Support preset STK names and icons for MSIM model" am: b9ffdaad25 am: ↵Jordan Liu
780af68fff am: 0c3dcd1b1b Change-Id: Ie88ef106c79b9945d753d6897e60f2bdaa4ebf1f
2017-10-30Merge "Support preset STK names and icons for MSIM model" am: b9ffdaad25Jordan Liu
am: 780af68fff Change-Id: Ifc3a51f6515482f69d41cfc8fe252bdf3ebed54e
2017-10-25Support preset STK names and icons for MSIM modelTakanori Nakano
This change provides an easy way to replace the STK application name and icon displayed on the launcher activity with preset resources. There are many SIM cards in the market that send SET-UP MENU command with no alpha identifier. This change improves the usability of multi-SIM models in such cases. Bug: 31295893 Change-Id: I437fa761cdd8bf47eee660c7bb2828b84c91e8af
2017-10-20Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: I190b4126dd9f1683ffe13cd56db05dc5095d64ae
2017-10-12Merge "Terminal shall display icon specified by DISPLAY TEXT command" am: ↵Jordan Liu
31056ddda0 am: 7f9a0643bb am: 950d9b0c2e am: e1ddef118b Change-Id: I17a1794b8ead9faebb380c8866b76b788895a0f4
2017-10-12Merge "Terminal shall display icon specified by DISPLAY TEXT command" am: ↵Jordan Liu
31056ddda0 am: 7f9a0643bb am: 950d9b0c2e Change-Id: Icb4cb892e2e4c2eff29392cdae0704688583bcd9
2017-10-12Merge "Terminal shall display icon specified by DISPLAY TEXT command"Jordan Liu
am: 31056ddda0 Change-Id: I397d377581fba46f9cb881a23a488e8ec5bcb863
2017-10-12Merge "Terminal shall display icon specified by DISPLAY TEXT command"Jordan Liu
2017-10-11Terminal shall display icon specified by DISPLAY TEXT commandTakanori Nakano
Terminal must be able to display icon on the pop-up message if it is requested by DISPLAY TEXT command. If not, terminal cannot pass the test cases described in ETSI TS 102 384 - 27.22.4.1.5 DISPLAY TEXT (Display of icons). Bug: 63914016 Test: Confirmed that the icon can be displayed as expected. Change-Id: I7b8b82cbc6951b582926add1b5f0640b977683ed
2017-09-27Merge "Remove the menu title from the screen for GET INPUT and DISPLAY TEXT" ↵Jordan Liu
am: 41b8b6f6eb am: a605d75628 am: dad8944256 am: 9cc19f033a Change-Id: If3f747c0ea48cbb27d016ae950edc5f5334df45d
2017-09-27Merge "Remove the menu title from the screen for GET INPUT and DISPLAY TEXT" ↵Jordan Liu
am: 41b8b6f6eb am: a605d75628 am: dad8944256 Change-Id: I8043cbdb84886a3cf6da4ad7c16291faf9a2ca9a
2017-09-27Merge "Remove the menu title from the screen for GET INPUT and DISPLAY TEXT"Jordan Liu
am: 41b8b6f6eb Change-Id: I2c58485557a8eca197119888ff90d1d4ad5d1609
2017-09-26Remove the menu title from the screen for GET INPUT and DISPLAY TEXTYoshiaki Naka
There is a thought that the title of the main menu should not be displayed on the screen shown for GET INPUT command and on the dialog shown for DISPLAY TEXT command. Bug: 64379095 Test: Manual - Verified the original behavior and the changed behavior Change-Id: I093c8943b62837ac9e7f8cc5ba8a9d526c97e1f9
2017-09-26Merge "Icon must be placed near the text string on the input screen" am: ↵Jordan Liu
35f15c2453 am: ba6607a097 am: 0e5ab36431 am: 01959fa64d Change-Id: I318788ea58c36412dc2acb1b9078731a2dd77639
2017-09-26Merge "Icon must be placed near the text string on the input screen" am: ↵Jordan Liu
35f15c2453 am: ba6607a097 am: 0e5ab36431 Change-Id: Ib536708bac56bde8eee782854e51e57db995f3ed
2017-09-26Merge "Icon must be placed near the text string on the input screen"Jordan Liu
am: 35f15c2453 Change-Id: I768f338174227e07e55e3159a844d09c7be983cd
2017-09-25Icon must be placed near the text string on the input screenYoshiaki Naka
A small icon can be displayed on the action bar of the input screen in the current implementation, but it is better to display it near the text string because icon can replace text string if it is self-explanatory icon. The size of text string should also be enlarged. Bug: 64371064 Test: Manual - Verified both with icon and without icon cases. Change-Id: I36a3dde9cc3717bb2910c55004da214d689e4274
2017-09-20Import translations. DO NOT MERGEBill Yi
Change-Id: I652069486a20367df868c21e2a062e3637001de3 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-09-06Import translations. DO NOT MERGEBill Yi
Change-Id: I0a1a4af466a095d41ef3fdfe50c24340d40cc008 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-08-23Import translations. DO NOT MERGEBill Yi
Change-Id: I2c931ab52196fd8422c948da6df97ecc31ad7303 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-08-17Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64680434 Change-Id: I81d9a17476b6192823332b7dd88c4440018c9a11
2017-08-12Import translations. DO NOT MERGEBill Yi
Change-Id: Iff66c11938aab390a9b0b68d2f28a0670b4fbb18 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-08-06Import translations. DO NOT MERGEBill Yi
Change-Id: If0cb0920625c5a2f989d17e476cdc74b93c66a7b Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-07-13Import translations. DO NOT MERGEBill Yi
Change-Id: Idc96646fba943f85e2b5b2aefc39c45d318a148a Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-07-07resolve merge conflicts of 528f2dc to stage-aosp-master am: 1652f2bca8pkanwar
am: 3fda0df0f1 Change-Id: I6004d2dbb06ad519ee1188faeedf363110cdd484
2017-07-07The activity should not cover the background of the dialogsYoshiaki Naka
The activity with the light theme is displayed under the dialog for DISPLAY TEXT command and PLAY TONE command because of the recent UI design change. That should not be the designed behavior. Bug: 63410524 Test: manual Change-Id: I77e9c7e614cee8b5d5464b64eae32314bcdd7e63
2017-07-06resolve merge conflicts of 528f2dc to stage-aosp-masterpkanwar
Bug: 35615464 Test: manual Change-Id: I4552c674f0d20e16ece3e1721e60ca22b71a7225
2017-07-06Import translations. DO NOT MERGEBill Yi
Change-Id: I15e8477a6ff66b1d39fddf40e0839f52ca4556ab Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-07-06Do not inform user when the alpha identifier is a null data.Srikanth Chintala
This code change has below fixes related to play tone proactive cmd. 1. Current code is not in accordance with the spec 3GPP TS 11.14, 6.4.5. Play Tone, as user is informed when the alpha identifier is a null data. With reference to the spec, if there is no alpha identifier, show the text message to the user depending on the config setting. If alpha identifier data is null, play only tone and do not inform the user. Move the code to handle play tone from ToneDialog to StkAppService in cases where only tone needs to be played and no user inform needed. Dismiss the tone dialog from StkAppService after play tone finish. Send the intent to StkAppService from ToneDialog to finish the play tone, when user presses back key. Ref spec: 3GPP TS 11.14, 6.4.5. Play Tone. 2. Send the correct Message object for the Play Tone command. When stopping the tone that is playing due to the Play Tone command, a delayed Message is sent to StkAppService with its 'arg2' field containing a flag that indicates if tone dialog activity needs to be closed. But when handling the received messages, StkAppService expects the Message object's 'arg2' field to contain the slot Id on which the command is received. This causes unexpected behavior when executing the Play Tone command. Use a different field in the Message object to send the the value of the flag which indicates if tone dialog activity needs to be closed. 3. set slotId in message for OP_STOP_TONE - unable to send the response to the correct sim card - Set the slotId as arg2 in the message Bug: 35615464 Test: manual Merged-In: Ib25986efe1d7c26976015f666580a3deb28bb328 Change-Id: Ib25986efe1d7c26976015f666580a3deb28bb328
2017-07-06Do not inform user when the alpha identifier is a null data.Srikanth Chintala
This code change has below fixes related to play tone proactive cmd. 1. Current code is not in accordance with the spec 3GPP TS 11.14, 6.4.5. Play Tone, as user is informed when the alpha identifier is a null data. With reference to the spec, if there is no alpha identifier, show the text message to the user depending on the config setting. If alpha identifier data is null, play only tone and do not inform the user. Move the code to handle play tone from ToneDialog to StkAppService in cases where only tone needs to be played and no user inform needed. Dismiss the tone dialog from StkAppService after play tone finish. Send the intent to StkAppService from ToneDialog to finish the play tone, when user presses back key. Ref spec: 3GPP TS 11.14, 6.4.5. Play Tone. 2. Send the correct Message object for the Play Tone command. When stopping the tone that is playing due to the Play Tone command, a delayed Message is sent to StkAppService with its 'arg2' field containing a flag that indicates if tone dialog activity needs to be closed. But when handling the received messages, StkAppService expects the Message object's 'arg2' field to contain the slot Id on which the command is received. This causes unexpected behavior when executing the Play Tone command. Use a different field in the Message object to send the the value of the flag which indicates if tone dialog activity needs to be closed. 3. set slotId in message for OP_STOP_TONE - unable to send the response to the correct sim card - Set the slotId as arg2 in the message Bug: 35615464 Test: manual Change-Id: Ib25986efe1d7c26976015f666580a3deb28bb328
2017-06-01Add action bar to display the option menu itemsTakanori Nakano
Some test cases in 3GPP TS 51.010-4 require End Session or Help option. Refer to TC 27.22.4.2.1 Expected Sequence 1.4 (GET INKEY), TC 27.22.4.9.1 Expected Sequence 1.4 (SELECT ITEM) and so on. Bug: 33329277 Test: manual - confirmed that the options are available as expected. Change-Id: I1016090d5ab0e0b878eee97d8a58bbeac360e0d1 Merged-in: I1016090d5ab0e0b878eee97d8a58bbeac360e0d1
2017-05-31Add action bar to display the option menu items am: 48544354feTakanori Nakano
am: 04ad4e5d8e Change-Id: Ibebfffc76fdfde34cd5ff4cbb591b7cc597d3989
2017-05-31Add action bar to display the option menu itemsTakanori Nakano
am: 48544354fe Change-Id: I73e5f4ae760131d714241839ad9880247a02fcdd
2017-05-30Add action bar to display the option menu itemsandroid-vts-8.0_r2android-vts-8.0_r1oreo-devTakanori Nakano
Some test cases in 3GPP TS 51.010-4 require End Session or Help option. Refer to TC 27.22.4.2.1 Expected Sequence 1.4 (GET INKEY), TC 27.22.4.9.1 Expected Sequence 1.4 (SELECT ITEM) and so on. Bug: 33329277 Test: manual - confirmed that the options are available as expected. Change-Id: I1016090d5ab0e0b878eee97d8a58bbeac360e0d1
2017-05-11Import translations. DO NOT MERGEBill Yi
Change-Id: I30a451e93724e743435d9d633a11800cb22604cd Auto-generated-cl: translation import
2017-05-10Import translations. DO NOT MERGEBill Yi
Change-Id: I59576369d4239e48dd1e2dc03d69b6223871b454 Auto-generated-cl: translation import
2017-04-28Import translations. DO NOT MERGEBill Yi
Change-Id: I101a47ab58cbb02ca9e3aa4e118c142672abdddc Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 11:53:14 +0000