summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-053-2/+3
|\ | | | | | | | | | | | | | | Android 7.1.2 Release 2 (N2G47E) # gpg: Signature made Mon 03 Apr 2017 01:41:49 AM CDT # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
| * Mark getFragments as @VisibleForTestingMaurice Lam2017-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Proguard was stripping out the method, and that somehow causes the test to be stuck at Instrumentation.startActivitySync(), causing lab devices to be stuck at this test for some 5 minutes. Test: adb shell am instrument -w -e class \ com.android.emergency.edit.EditInfoActivityTest \ com.android.emergency.tests Bug: 35674347 Change-Id: I5fb6392b6db58c8a52c1b15fe334428fd0b676e4 (cherry picked from commit e18de7871b4e8fba1fe65c011613dc4abac11079) (cherry picked from commit 104c84eb89d4e989504d29ac360fa1f241f53493)
| * Import translations. DO NOT MERGEBill Yi2017-02-021-1/+1
| | | | | | | | | | Change-Id: Ie16bfc110b8afce581a8c96da3731f321a5d8133 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBill Yi2016-11-0480-102/+182
| | | | | | | | | | Change-Id: I16fe8e026e18e60cf6a43bee800426424334ce7b Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBill Yi2016-09-220-0/+0
| |\ | | | | | | | | | | | | | | | am: 97be70c0ba -s ours Change-Id: I46570b3e11c6d8ccb1a5a7716e70f9643669f482
| * \ Fixed clear all does not work under multi-windowNaoki Amano2016-09-202-8/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 9d8f622e4d Change-Id: I1292df04a41ef76171b680e14ef98844013d5ac7
| * \ \ Import translations. DO NOT MERGE am: a886aa64e9 -s oursBill Yi2016-09-170-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 7828999105 -s ours Change-Id: I3d5c6afa0382ce13982069e251a72aa509b9cb0a
| * \ \ \ Import translations. DO NOT MERGEBill Yi2016-09-130-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d268b06c9 -s ours Change-Id: Iee323fbe13a445c55fdb87fdf7a870d8c961c2dd
| * \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-09-070-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 01ea54f7ce -s ours Change-Id: Ia2d965b04f7d5318749d2a824e1c5283e11f813a
| * \ \ \ \ \ Add extra string to empty statemariagpuyol2016-09-064-15/+38
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9d4ff9c4b1 Change-Id: I41c55c8503e5075433419e9f76c9365f2f1a1e41
| * \ \ \ \ \ \ Merge "Configure code coverage filter." into nyc-mr1-devAllen Hair2016-08-260-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b0d6614014 Change-Id: Ic4686cdb99ba5cae945bb8d63cb73edc9a56b23f
| * \ \ \ \ \ \ \ Configure code coverage filter.Allen Hair2016-08-261-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ba7ea36cc4 Change-Id: I674d6d01f4926513c27fc3c13fa1c33b84357979
| * \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBill Yi2016-08-220-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 502446f442 -s ours Change-Id: I424cbfac18dc0a766cbb3d4a7aa0442d9176d4c7
| * \ \ \ \ \ \ \ \ \ Fix disambiguation problem when calling contactmariagpuyol2016-08-191-1/+15
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fa5c314a25 Change-Id: I888e4da97016947d00e18f93eaa3b99396c334c3
* | | | | | | | | | | | Automatic translation importcm-14.1_oldAbhisek Devkota2017-03-151-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I34cd0ad8d655b32f9108f1ca03fb441fc34b729c
* | | | | | | | | | | | Automatic translation importAbhisek Devkota2017-02-161-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58af0a82888715c613afd88fde0f7b1800483244
* | | | | | | | | | | | Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-3018-0/+1494
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice0fdc1ae4d0caa23628ec7c3d69836ddaf9b34c Ticket: -
* | | | | | | | | | | | Merge 7e3a2b5bd6b6671c61255e98fd9980128b0f0962 on remote branchLinux Build Service Account2016-12-1592-139/+270
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d70832b7acb3a3daa0543b881724bb24a2e7b16
| * | | | | | | | | | | | Merge N-MR1 to remote branch.Lalit Kansara2016-12-0892-139/+270
|/| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I2470765726c13ed21fcd820022a1e151fd5c1b29
| * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-09-221-8/+8
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26c4059ebd2f78c79eac903187aa092e77f06311 Auto-generated-cl: translation import
| * | | | | | | | | | Fixed clear all does not work under multi-windowNaoki Amano2016-09-192-8/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After going into multi-window or rotate screen, getFragments() refers wrong fragments, so changed to update UI by adapter Bug: 31510193 Change-Id: Ic5f998e6543954f3bd9c497e10c56b4a939edfe8
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-09-170-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a886aa64e9 -s ours Change-Id: I00d991f8765e5133cfedf0e9bb06193d209373d5
| | * | | | | | | | Import translations. DO NOT MERGEBill Yi2016-09-175-20/+20
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 31516661 Change-Id: Iebcb69abeaa6699818a19f87f9c26ca21b281df0
| * | | | | | | / Import translations. DO NOT MERGEBill Yi2016-09-1380-320/+160
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2231749f01bfdb8fe943a630bfff803464d8cdc6 Auto-generated-cl: translation import
| * | | | | | | Import translations. DO NOT MERGEBill Yi2016-09-0780-80/+320
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie803d8d46d852848dfafed713fe71c9f9bfa6c22 Auto-generated-cl: translation import
| * | | | | | Add extra string to empty statemariagpuyol2016-09-054-15/+38
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug:30927743 Change-Id: Id598557fa19fc3f74274394e3e03a2fb59c5e1d3
| * | | | | Merge "Configure code coverage filter." into nyc-mr1-devAllen Hair2016-08-261-0/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Configure code coverage filter.Allen Hair2016-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 28269038 Change-Id: Iaa0c56812d3f178a70ff2a28adeb146ae92c4eec
| * | | | Import translations. DO NOT MERGEBill Yi2016-08-196-13/+13
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: I85f699f289af835600deb837b89d3e868a9760b7 Auto-generated-cl: translation import
| * | | Fix disambiguation problem when calling contactmariagpuyol2016-08-161-1/+15
| | |/ | |/| | | | | | | | | | Bug:30872007 Change-Id: I3f498d02b26f65ce872f761389dfefbda32737fd
| * | Import translations. DO NOT MERGEBill Yi2016-07-203-8/+8
| |/ | | | | | | | | Change-Id: I0de4ea41a5aad13fa403e7d35661c311f9f51e82 Auto-generated-cl: translation import
| * Refactor EmergencyInfo theme colors.Andrew Sapperstein2016-06-214-8/+18
| | | | | | | | | | | | | | | | | | | | | | Introduces stock colors (primary_color, primary_dark_color, etc) to allow overriding the colors via resource overlays. Also updated ic_add_24dp.xml to use colorAccent instead of a hardcoded tint color. BUG: 29004404 Change-Id: I13900cf25d5153a2a22acf8945f307c5eb6b28c7
| * Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot2016-06-0348-177/+177
| |\
| | * Import translations. DO NOT MERGEBill Yi2016-06-0348-177/+177
| | | | | | | | | | | | | | | Change-Id: I7964bd9d03c8b5165c965393693511422ea25071 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBill Yi2016-06-030-0/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | am: 2a4cf203e3 -s ours * commit '2a4cf203e330f2fd2b531c2ace96f003d43e5e4c': Import translations. DO NOT MERGE Change-Id: Ia75e977a91b54a8968628e88f0451bfc1c80dbce
| * | Fix color issuesmariagpuyol2016-06-023-1/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dff26b8f88 * commit 'dff26b8f88a99bb365096e5c5fff62f24f31ab80': Fix color issues Change-Id: I17cacf79c153e6db4a81e6dae0edd226d79872ce
| * \ \ Remove date of birthmariagpuyol2016-06-0211-693/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 103241623e * commit '103241623e35b19ea9e88b58392334ad744fe6c8': Remove date of birth Change-Id: I8b511e3a7b2e8e90c3371de15ecc4f0bd39cbb7e
| * \ \ \ Merge "Change icon color from red to gray" into nyc-devmariagpuyol2016-05-245-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3c90d6352c * commit '3c90d6352c0fdf4e65fdb92dc5008b9ad6d47e1d': Change icon color from red to gray Change-Id: If3e890276ebaa6f56b86a62045a4f21a908a466f
| * \ \ \ \ Import translations. DO NOT MERGEBaligh Uddin2016-05-220-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0c231fae91 -s ours * commit '0c231fae91256ea1b5645e5deddc1aeaf60e4921': Import translations. DO NOT MERGE Change-Id: I2e2898e548cdde12d4136e9b1943df0f4a583cb4
| * \ \ \ \ \ Merge "Force phone number to be LTR" into nyc-devmariagpuyol2016-05-141-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 22cc0678b6 * commit '22cc0678b6240ddf13deb6adb7ca73fc9cd1dbef': Force phone number to be LTR Change-Id: I035a605f1d338407b31f2f76fb72f49d364ad1ec
| * \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBaligh Uddin2016-04-270-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-04-265-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5f8fb3fa3a557577774de54157d43f1f7ea2186 Auto-generated-cl: translation import
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-275-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib029493038562f7826198baae094b1baf494bdca Auto-generated-cl: translation import
| * | | | | | | | Enable ViewInfoActivity.mariagpuyol2016-04-261-2/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b101808 * commit 'b101808f242719aea123c138883a0854cd0a8ad1': Enable ViewInfoActivity. Change-Id: I141091fcdc84517cbd7cf838bd02f4a30debbe3b
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2016-04-250-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 27eb383 -s ours * commit '27eb383e5b2d96f8da2b97a065ce0d897ae592a1': Import translations. DO NOT MERGE Change-Id: Ie685e19b8edeb74cb96fd02ec82dda0348cfade4
* | \ \ \ \ \ \ \ \ merge in nyc-release history after reset to nyc-devstaging/cm-14.0cm-14.0The Android Automerger2016-06-050-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-250-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-230-0/+0
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-150-0/+0
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-270-0/+0
| | | | |\ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 09:43:29 +0000