summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBill Yi2017-08-042-2/+2
| | | | | | Change-Id: I826e59e9d33ea13b0ba755a0e0637b1d227579ba Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Import translations. DO NOT MERGEBill Yi2017-05-231-2/+2
| | | | | Change-Id: I6b9db6d64d5891a8bf36b54bb62fd0ccd1912dc7 Auto-generated-cl: translation import
* Merge "Adding config to disable temporary permission granting" into oc-dev ↵Michael Dooley2017-05-171-0/+4
|\ | | | | | | | | | | | | | | am: b65719af5e am: 0f5f0568cb Change-Id: I794fb66edcc24246bc1acb8b46d28542ab8d570c
| * Merge "Adding config to disable temporary permission granting" into oc-devMichael Dooley2017-05-171-0/+4
| |\ | | | | | | | | | | | | | | | am: b65719af5e Change-Id: Ic895b3b82bb0fcfc375354665b8779716f601dee
| | * Merge "Adding config to disable temporary permission granting" into oc-devMichael Dooley2017-05-171-0/+4
| | |\
| | | * Adding config to disable temporary permission grantingmike dooley2017-05-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And disable temporary permission granting by default. Test: manual tests Bug: 37475749 Change-Id: I53743cfd9b4f12d6c848f27acd16920d6939ad9c
| | * | Import translations. DO NOT MERGEBill Yi2017-05-0921-37/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I88bbff28a263896e5b0b191214750496b3318fb7 Auto-generated-cl: translation import
| | * | Import translations. DO NOT MERGEBill Yi2017-05-0580-7/+102
| | |/ | | | | | | | | | | | | Change-Id: Ibeb4124b984fd5c338678c1b93067d378705668f Auto-generated-cl: translation import
| * | Merge "Confirm managed call when there are ongoing self-managed calls." into ↵Tyler Gunn2017-05-031-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | oc-dev am: ba03779236 Change-Id: Ie9c99152af59dab4225a911285fcd6005248a1d6
| | * Merge "Confirm managed call when there are ongoing self-managed calls." into ↵Tyler Gunn2017-05-031-0/+4
| | |\ | | | | | | | | | | | | oc-dev
| | | * Confirm managed call when there are ongoing self-managed calls.Tyler Gunn2017-05-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user places a managed call while there are ongoing self-managed calls, the system will now display a dialog giving the user the option of NOT placing the managed call, or placing the managed call and disconnecting the ongoing self-managed call(s). This is done by stopping the outgoing call during startOutgoingCall and bringing up a dialog to confirm whether the user wants to place the call. If they chose to place the call, ongoing self-mgds calls are disconnected, the call is added, and the NewutgoingCallBroadcast is sent as usual. If the user chooses not to start the call, the call is cancelled. Test: Manual Bug: 37828805 Merged-In: I8539b0601cf5f324d2fb204485ee0d9bbf03426d Change-Id: I8539b0601cf5f324d2fb204485ee0d9bbf03426d
| | * | Import translations. DO NOT MERGEThe Android Open Source Project2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If2768e90e016e141852b04012b8533b5b6cd3471 Auto-generated-cl: translation import
| | * | Import translations. DO NOT MERGEBill Yi2017-04-2813-24/+24
| | |/ | | | | | | | | | | | | Change-Id: Ice3a79b006a07dca05e94ac998c840fab35927dc Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBill Yi2017-04-268-13/+13
| | | | | | | | | | | | | | | Change-Id: I23a86346e8f491072b96a9b360667a21defcbe0b Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBill Yi2017-04-1044-164/+127
| | | | | | | | | | | | | | | Change-Id: I804c2679157eb3152d3e70ecf55185f56c715b6b Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBill Yi2017-04-0777-1851/+1125
| | | | | | | | | | | | | | | Change-Id: I36fa4a4c7ef7f8dca13db123104cbf8a4cb2847c Auto-generated-cl: translation import
| * | Add Telecom notification channels.Tyler Gunn2017-04-061-0/+5
| |\| | | | | | | | | | | | | | | | am: acc09c4487 Change-Id: Ic6ecb016851766851d54165afd976dbc0932db4d
| | * Add Telecom notification channels.Tyler Gunn2017-04-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Test: Manual Bug: 36866129 Merged-In: I49194128b4f526205055137d4ebaa8b282baa90f Change-Id: I49194128b4f526205055137d4ebaa8b282baa90f (cherry picked from commit dce902a0cd4d7060e1825cc3cde8d7f76eb67086)
| | * Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-0177-0/+1963
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2017-03-3077-0/+1963
| | | | | | | | | | | | | | | | | | | | Change-Id: I6ba65ad2fcd5680155f082fad4f34eaec01569b7 Auto-generated-cl: translation import
| | * | Self-Managed Incoming Call Disambiguation UX.Tyler Gunn2017-03-3048-0/+50
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Handle auto-disconnect of foreground call when answering a self-managed call. - Enforce restriction that the PhoneAccount associated with a self-managed CS must have a label which is the app's name. - Ensure self-managed phone accounts can't be registered with call provider, connection manager, or sim sub capabilities. - Add "incoming call" UX which is shown when a new incoming call from a self-managed CS comes in and there is an existing call for another CS. Test: Unit, manual Bug: 34159263 Merged-In: I371be9baa6f56c77aa83349977c0131f0e319047 Change-Id: I371be9baa6f56c77aa83349977c0131f0e319047
* | | Import translations. DO NOT MERGEBill Yi2017-05-0921-37/+22
| | | | | | | | | | | | | | | Change-Id: I8aac15cabd6910a304e51c86ef474e8966ee64d7 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-05-0580-7/+102
| | | | | | | | | | | | | | | Change-Id: Iecbc333425692bf7f40da6782c18d2b99e3c2dc3 Auto-generated-cl: translation import
* | | Merge "Confirm managed call when there are ongoing self-managed calls."Tyler Gunn2017-05-031-0/+4
|\ \ \
| * | | Confirm managed call when there are ongoing self-managed calls.Tyler Gunn2017-05-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user places a managed call while there are ongoing self-managed calls, the system will now display a dialog giving the user the option of NOT placing the managed call, or placing the managed call and disconnecting the ongoing self-managed call(s). This is done by stopping the outgoing call during startOutgoingCall and bringing up a dialog to confirm whether the user wants to place the call. If they chose to place the call, ongoing self-mgds calls are disconnected, the call is added, and the NewutgoingCallBroadcast is sent as usual. If the user chooses not to start the call, the call is cancelled. Test: Manual Bug: 37828805 Change-Id: I8539b0601cf5f324d2fb204485ee0d9bbf03426d
* | | | Import translations. DO NOT MERGEThe Android Open Source Project2017-05-021-1/+1
|/ / / | | | | | | | | | | | | Change-Id: Ide1bce8b3eaa1ce03031132a0ec6d6ca1fd3702a Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-04-2813-24/+24
| | | | | | | | | | | | | | | Change-Id: Ibc4784a6b84a2eaa385c673c3f3a86ab044e97e1 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-04-268-13/+13
| | | | | | | | | | | | | | | Change-Id: Id850b49ff4c3bc5bc1e831cb3bb77b32ff062690 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-04-1042-168/+84
| | | | | | | | | | | | | | | Change-Id: I8665663dbb89062cf6f191630effb6d9dc5ba8dc Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-04-0780-1927/+1170
| | | | | | | | | | | | | | | Change-Id: I4f1e2d7a2f5a8adedc3aad62753797aa392cd690 Auto-generated-cl: translation import
* | | Add Telecom notification channels.Tyler Gunn2017-04-051-0/+5
| | | | | | | | | | | | | | | | | | Test: Manual Bug: 36866129 Change-Id: I49194128b4f526205055137d4ebaa8b282baa90f
* | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-03-3180-0/+2041
|\ \ \ | |/ / |/| |
| * | Import translations. DO NOT MERGEBill Yi2017-03-3080-0/+2041
| |/ | | | | | | | | Change-Id: Idbb8ed7a0d855ab9ab4259ba2b17a30128e6b681 Auto-generated-cl: translation import
* | Merge "Self-Managed Incoming Call Disambiguation UX." am: b77f30fa1f am: ↵Tyler Gunn2017-03-3148-0/+50
|\ \ | |/ |/| | | | | | | | | | | be4ff39882 am: c6e9cba5a9 Change-Id: I6f186038a14efe86d31bcc4616f194dd40b1981f
| * Merge "Self-Managed Incoming Call Disambiguation UX."Tyler Gunn2017-03-3148-0/+50
| |\ | | | | | | | | | | | | | | | am: b77f30fa1f Change-Id: I213b0d78a647086ce3bfa4728e4445854ab45e45
| | * Self-Managed Incoming Call Disambiguation UX.Tyler Gunn2017-03-3048-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Handle auto-disconnect of foreground call when answering a self-managed call. - Enforce restriction that the PhoneAccount associated with a self-managed CS must have a label which is the app's name. - Ensure self-managed phone accounts can't be registered with call provider, connection manager, or sim sub capabilities. - Add "incoming call" UX which is shown when a new incoming call from a self-managed CS comes in and there is an existing call for another CS. Test: Unit, manual Bug: 34159263 Change-Id: I371be9baa6f56c77aa83349977c0131f0e319047
* | | Merge "Add strings for incoming call UX for self-managed calls." am: ↵Tyler Gunn2017-03-241-0/+72
|\| | | | | | | | | | | | | | | | | | | | | | | 3e9c7d2039 am: 2fafee3f4c am: f199dc70a4 Change-Id: Id7c88915bc24b0c21e1e303d0158ba632d5dc9c5
| * | Merge "Add strings for incoming call UX for self-managed calls."Tyler Gunn2017-03-241-0/+72
| |\| | | | | | | | | | | | | | | | am: 3e9c7d2039 Change-Id: I3fd7d4ef0703becef3122512495f3355917930d5
| | * Add strings for incoming call UX for self-managed calls.Tyler Gunn2017-03-241-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These strings are added in advance of consuming code. There are a lot of them, but I tried to cover a lot of scenarios for ongoing calls. Test: Manual Bug: 34159263 Change-Id: I5ac06c0861d99799fff2b56ccc2b7871ec128fb7
| | * Import translations. DO NOT MERGEBill Yi2016-11-2077-362/+1825
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 32177112 Change-Id: Ieba2b25f42ef0a0c040bdfd336c88285b230700d
* | | Import translations. DO NOT MERGEBill Yi2017-03-232-6/+6
| | | | | | | | | | | | | | | Change-Id: Ie77eae53955b54ecedb6d3ffdfd5fd1f518907d4 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-03-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I58ef047edbe0b6a35f25d25cc552c4b148609740 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2017-01-251-3/+3
| | | | | | | | | | | | | | | Change-Id: I7eb76a0ef99b263f8c6bdd3413233cc0703c251b Auto-generated-cl: translation import
* | | Rename language+country resources to just languageRoozbeh Pournader2017-01-1030-0/+0
| | | | | | | | | | | | | | | | | | Bug: 26496609 Test: none Change-Id: I4e39aae2d25b97c2e970fd6522a203187be9bdea
* | | Import translations. DO NOT MERGEBill Yi2017-01-091-1/+1
| | | | | | | | | | | | | | | Change-Id: I0774037c74e25bc7b19fcd4aa7d7f62bf1d270f7 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-12-091-1/+1
| | | | | | | | | | | | | | | Change-Id: I10ce2cc9906080f69d5d7c214267778ab9ea807d Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-12-055-6/+6
| | | | | | | | | | | | | | | Change-Id: I619c91a25d8268644633f61899378318c4342167 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-11-301-5/+5
| | | | | | | | | | | | | | | Change-Id: I41c9987469f781410a1b3c1ccae7bd4f6800859f Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-11-281-1/+1
| | | | | | | | | | | | | | | Change-Id: If9389bf9c30f6c8d3dc13d5412f6dc9ca69293c2 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-11-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I1b956e8d7e1eb6b52acfc2108b23ed38b9bcf6a7 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 17:57:24 +0000