summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1caf/cm-12.1Matt Garnes2015-04-3023-118/+240
|\
| * Merge "Contacts: "com.android.contacts" force close 9 times."Linux Build Service Account2015-04-171-2/+1
| |\
| | * Contacts: "com.android.contacts" force close 9 times.xmao2015-04-171-2/+1
| |/ | | | | | | | | | | | | - Fix a NullPointerException in MyQrcodeActivity. CRs-Fixed: 806743 Change-Id: Ia77cf480375287aec1c07c746eceeb67648f8f36
| * Merge "Contacts: Fix pop up "no contacts" after clear all call log"Linux Build Service Account2015-04-131-2/+6
| |\
| | * Contacts: Fix pop up "no contacts" after clear all call logwangjing2015-04-101-2/+6
| |/ | | | | | | | | | | | | | | | | | | | | Should not pop up the msg when the action of the intent is ACTION_MULTI_PICK_CALL. When the action is ACTION_MULTI_PICK_CALL, do not pop up the "no contacts" toast. CRs-Fixed: 820112 Change-Id: Ib3f7db09edb1f02f2a69208069726aca084c1e82
| * Merge "Contact: fix the toast of enhance screen in Chinese is English issue."Linux Build Service Account2015-04-080-0/+0
| |\
| | * Contact: fix the toast of enhance screen in Chinese is English issue.xmao2015-04-021-0/+1
| | | | | | | | | | | | | | | | | | CRS-Fixed: 812338 Change-Id: Ieb5ea2b50cdc48ea4166903242c8d849a35577e7
| * | Merge "Merge e489b68e17411bd8a8bd3826ffcd8799cf4781e8 on remote branch"Linux Build Service Account2015-04-081-0/+1
| |\ \ | | |/ | |/|
| | * Merge e489b68e17411bd8a8bd3826ffcd8799cf4781e8 on remote branchLinux Build Service Account2015-04-051-0/+1
| |/| | | | | | | | | | Change-Id: I3477fe285bf9ceb711162a4d43a206483ddeb910
| | * Merge "Contact: fix the toast of enhance screen in Chinese is English issue."Linux Build Service Account2015-04-021-0/+1
| | |\
| | | * Contact: fix the toast of enhance screen in Chinese is English issue.xmao2015-03-311-0/+1
| | |/ | | | | | | | | | | | | | | | CRS-Fixed: 812338 Change-Id: Ieb5ea2b50cdc48ea4166903242c8d849a35577e7
| * | Merge "Contacts: Crash when adding 2000 contacts to local group ."Linux Build Service Account2015-03-311-39/+49
| |\ \
| | * | Contacts: Crash when adding 2000 contacts to local group .kaiyiz2015-03-241-39/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contacts will crash when adding 2000 contacts to local group. Optimize the group members adding methods. Change-Id: I829f9c156a6a2f672bcf4dbb20b9a47d101df972 CRs-Fixed: 809499
| * | | Merge "Merge 11e8d8f8fe4c695800106b70de633b23597ff62d on remote branch"Linux Build Service Account2015-03-300-0/+0
| |\ \ \
| | * | | Merge 11e8d8f8fe4c695800106b70de633b23597ff62d on remote branchLinux Build Service Account2015-03-290-0/+0
| |/| | | | | | |/ | | |/| | | | | Change-Id: If6bfe932b202dfe5ca2308a2eb261022274971c2
| | * | Merge "Contacts: Control the create RCS group chat entrance in ↵Linux Build Service Account2015-03-271-10/+11
| | |\ \ | | | | | | | | | | | | | | | GroupDetailFragment."
| | | * | Contacts: Control the create RCS group chat entrance in GroupDetailFragment.xmao2015-03-171-10/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No matter in CMCC or non-CMCC build, the create RCS group chat entrance is always visible. This is not expected. To fix this issue, correct the logic in onPrepareOptionMenu(menu) in GroupDetailFragment. CRs-Fixed: 808753 Change-Id: Ia903b29e5b49c905824c22dba1327f9adffea421
| * | | Merge "Contacts: Add checkableimageview to sim import picker"Linux Build Service Account2015-03-271-1/+3
| |\ \ \
| | * | | Contacts: Add checkableimageview to sim import pickerRaj Yengisetty2015-03-251-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repro: - Open contacts, and select Import/Export from overflow menu - Import from SIM card - Select contact(s) - Observe: there's element in the list view to show checked state Change-Id: Ic5f3a390ea4501cfbef0252cdf6bd50e93b260eb (cherry picked from commit e98c8a501ab325b15e94a8e5a62b2c40a75b1634)
| * | | Merge "Contacts: Control the create RCS group chat entrance in ↵Linux Build Service Account2015-03-231-10/+11
| |\ \ \ | | | | | | | | | | | | | | | GroupDetailFragment."
| | * | | Contacts: Control the create RCS group chat entrance in GroupDetailFragment.xmao2015-03-171-10/+11
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No matter in CMCC or non-CMCC build, the create RCS group chat entrance is always visible. This is not expected. To fix this issue, correct the logic in onPrepareOptionMenu(menu) in GroupDetailFragment. CRs-Fixed: 808753 Change-Id: Ia903b29e5b49c905824c22dba1327f9adffea421
| * | | Merge "Contacts: Text of accounts change dialog overlap."Linux Build Service Account2015-03-211-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Contacts: Text of accounts change dialog overlap.kaiyiz2015-03-201-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Contacts is not allocating proper size for dialog where text overlap. Change the button's ellipsize property to display all text. Change-Id: I0596dfeb1f0446a50eb9730e8943cb129fcc0899 CRs-Fixed: 810352
| * | Merge "Remove viewContactDesription intent label"Linux Build Service Account2015-03-141-1/+1
| |\ \
| | * | Remove viewContactDesription intent labelBrian Attwell2015-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19013381 Change-Id: Iab1303ec397f2339505ef077c9b09885c6843ebe
| * | | Merge "Fix ContactLoader IllegalArgumentException crash"Linux Build Service Account2015-03-142-6/+12
| |\| |
| | * | Fix ContactLoader IllegalArgumentException crashJay Shrauner2015-03-132-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display toast instead of crashing when unable to load contact due to acore crash or invalid URI. Bug: 18689131 Change-Id: I0e393e833bbb839af08ba6f4c10203a7d9abd3d7
| * | | Merge "Fix ConcurrentModificationException"Linux Build Service Account2015-03-141-1/+8
| |\| |
| | * | Fix ConcurrentModificationExceptionJay Shrauner2015-03-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch from using a HashMap to a ConcurrentHashMap for the loader results map. Bug:18688436 Change-Id: Ib90f794b673d88f54fc841c0fa001866139f47c6
| * | | Merge "Catch ActivityNotFoundExceptions in onClick"Linux Build Service Account2015-03-141-2/+8
| |\| |
| | * | Catch ActivityNotFoundExceptions in onClickJay Shrauner2015-03-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display a toast when activity isn't found. Bug:18537920 Change-Id: I84bf07e64fffa92b6fe6de8d3de0259d339d35f3
| * | | Merge "Don't show shortcut menu item for homescreen"Linux Build Service Account2015-03-141-0/+3
| |\| |
| | * | Don't show shortcut menu item for homescreenBrian Attwell2015-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | Bug: 18581314 Change-Id: I169ca8e554d3fb288526eee7fc1532d7de2220da
| * | | Merge "Fix NPE in onHandleIntent"Linux Build Service Account2015-03-141-0/+4
| |\| |
| | * | Fix NPE in onHandleIntentJay Shrauner2015-03-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch null intents. Bug:18579403 Change-Id: I4ee3baf97c8767f0b166f122c13f8abab3a75a4f
| * | | Merge "Fix NPE in shareContact"Linux Build Service Account2015-03-141-1/+3
| |\| |
| | * | Fix NPE in shareContactJay Shrauner2015-03-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether we have a shareable contact before trying to share it. Bug:18535080 Change-Id: Id49d40227f58c592ff83c0d848ac690b85dde8d5
| * | | Merge "Fix NPE in getInsertedRawContactId"Linux Build Service Account2015-03-141-0/+3
| |\| |
| | * | Fix NPE in getInsertedRawContactIdJay Shrauner2015-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | Bug:18532368 Change-Id: I5758ac9c4ce9c95c38b92c0153f7b39bee8e0a98
| * | | Merge "Don't save contact after deleting it"Linux Build Service Account2015-03-141-3/+4
| |\| |
| | * | Don't save contact after deleting itBrian Attwell2015-03-131-3/+4
| | | | | | | | | | | | | | | | | | | | Bug: 18514447 Change-Id: I695aa41eb6870b7c256efb9f5eccf9e0eadefe4f
| * | | Merge "Fix NPE in decodedBitmapDrawable"Linux Build Service Account2015-03-141-3/+10
| |\| |
| | * | Fix NPE in decodedBitmapDrawableJay Shrauner2015-03-131-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for whether bitmap was successfully decoded from byte array. Bug:18508529 Change-Id: If5c1bb3f0b726be5891d5b33d8bc7073cf40b108
| * | | Merge "Fix SecurityException crashes in onClick"Linux Build Service Account2015-03-141-0/+6
| |\| |
| | * | Fix SecurityException crashes in onClickJay Shrauner2015-03-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch SecurityExceptions when attempting to launch activites and display a toast indicating the app isn't found, consistent with Launcher2 handling. Bug:18506811 Change-Id: I1b0c4a02597279ac31621293aa3c29d87a006ba4
| * | | Merge "Don't crash when sent malformed intent"Linux Build Service Account2015-03-141-2/+5
| |\| |
| | * | Don't crash when sent malformed intentJay Shrauner2015-03-131-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If lookupUri isn't passed in abort the intent request without crashing. Bug:18506352 Change-Id: I128a3e4e84ec35d48d139d2cc42da38cd761ff42
| * | | Merge "Fix NPE in ContactSaveService"Linux Build Service Account2015-03-141-0/+8
| |\| |
| | * | Fix NPE in ContactSaveServiceJay Shrauner2015-03-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for null cursors before accessing. Bug:18504067 Change-Id: I9945adfd45671d296ad64cd57aa4985a94d18144
| * | | Merge "Correctly set search string when entering search"Linux Build Service Account2015-03-142-4/+7
| |\| |