Stocks, dollar rise as U.S.-China trade rhetoric softens