drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,317 Commits 1 Branch 0 Tags
Commit Graph

256317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hufnagle
38138600d2 docs: Updated ShortcutManager and ShortcutInfo class references. 
am: 68d699d100

Change-Id: I3d6ba36f36eddc3e9075383011732143c910a13f
 2016-10-19 23:53:36 +00:00
Winson
be0eded075 Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev 
am: 5f4169b5ea

Change-Id: I98a6d30d26fd00d09e670d22663617ccd0c5ca62
 2016-10-19 19:18:31 +00:00
Winson
cfdbd7b2e2 Skip getting transforms for ignored tasks. 
am: 448c0adb78

Change-Id: Ie929c699ee466b1298acab07eefa68006a92cdb1
 2016-10-19 19:18:26 +00:00
Andrii Kulian
618b3cb6fa Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev 
am: 6e4f6ecbab

Change-Id: I56995f1b7239f4b3bb1a81c46891af04016561f0
 2016-10-19 19:16:52 +00:00
Andrii Kulian
39be2e91ca DO NOT MERGE -- Use focused activity value when moving task back 
am: da3b648b64

Change-Id: Ib706755c056ed27050375a675169f7df3f5f141a
 2016-10-19 19:16:50 +00:00
TreeHugger Robot
5f4169b5ea Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev 2016-10-19 18:45:26 +00:00
Andrii Kulian
6e4f6ecbab Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev 2016-10-19 18:31:37 +00:00
Dan Yu
a2ffd6e04c Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 am: 8233c03d1e 
am: 0346fee93c

Change-Id: I1997e8e14e5d0ddfbf60ea08797b57d107393411
 2016-10-19 18:12:16 +00:00
Dan Yu
0346fee93c Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 
am: 8233c03d1e

Change-Id: If0291ee0b6df1c0fb81785b490cdf716ba9cc8b7
 2016-10-19 18:05:37 +00:00
Daniel Yu
3d74d9933c docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d am: 9ce21dc769 
am: f45beedf6c

Change-Id: I2895221a6675da5909d4dbb1186321018189e10d
 2016-10-19 18:05:18 +00:00
Yang Ni
c7c49fbe14 Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8 am: 4a9883cdf8 
am: 02addb0b41

Change-Id: I7f934cb65171862b1ef5f0e1c41c5c1916b99529
 2016-10-19 17:59:16 +00:00
Yang Ni
29ce2a91c9 Updated API reference doc for Single-Source RS am: 51f1e93be7 am: 246b0bcc9a 
am: 93f0442cbd

Change-Id: I9d26975a2ce8c0c9efa187cb1c90207f73b3c42a
 2016-10-19 17:58:16 +00:00
Daniel Yu
f45beedf6c docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d 
am: 9ce21dc769

Change-Id: I1066a9122bab7f3fe620bd23f17adc36559133a4
 2016-10-19 17:57:11 +00:00
Yang Ni
02addb0b41 Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8 
am: 4a9883cdf8

Change-Id: I1a4378d4ec4c5b2e720d81d90d72c5b7fedce261
 2016-10-19 17:52:39 +00:00
Dan Yu
8233c03d1e Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 
am: 3aa0ff2de7

Change-Id: If9e2b5d23f40a5d48906b81f818a2e9b5e8bb24a
 2016-10-19 17:52:35 +00:00
Daniel Yu
9ce21dc769 docs: Updating TIF docs for new TIF Companion library. am: e0810402fb 
am: f8a8260c0d

Change-Id: Ida18c6b46ccff01cb6299b1774fbcc724f54712a
 2016-10-19 17:51:36 +00:00
Yang Ni
93f0442cbd Updated API reference doc for Single-Source RS am: 51f1e93be7 
am: 246b0bcc9a

Change-Id: I572709a23a33f0a17ad754221c27a042f9c44f2e
 2016-10-19 17:51:32 +00:00
Dan Yu
3aa0ff2de7 Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs 
am: dc69de5ac6

Change-Id: I3f49c5fbd2dc9f298cdf0cdd8acc5f49188319d4
 2016-10-19 17:44:48 +00:00
Daniel Yu
f8a8260c0d docs: Updating TIF docs for new TIF Companion library. 
am: e0810402fb

Change-Id: Ic44c96963d1dd172f07f6564a084ca731bf49762
 2016-10-19 17:44:46 +00:00
Yang Ni
4a9883cdf8 Merge "Updated API reference doc for Single-Source RS" into nyc-dev 
am: 6aee6e9ca8

Change-Id: I86ae7b92e3c6bb2202375a990f0203630afa5744
 2016-10-19 17:37:43 +00:00
Yang Ni
246b0bcc9a Updated API reference doc for Single-Source RS 
am: 51f1e93be7

Change-Id: Ie8c820ea2d55b16f66afd53034b69d4c770d17e0
 2016-10-19 17:37:39 +00:00
Andrew Solovay
f31f36c305 Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev 
am: 439d71837e

Change-Id: I33ca9cc9e7176df2916c70619c007260d035afdf
 2016-10-19 17:36:48 +00:00
Andrew Solovay
630b6320eb docs: Updating the samples "what's new" for API 7.1 
am: c86db22b2f

Change-Id: Ic7feef22e3337445f8dccfcb237783a40dd59099
 2016-10-19 17:36:46 +00:00
Dan Yu
dc69de5ac6 Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs 2016-10-19 17:30:46 +00:00
Yang Ni
6aee6e9ca8 Merge "Updated API reference doc for Single-Source RS" into nyc-dev 2016-10-19 17:26:00 +00:00
Andrew Solovay
439d71837e Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev 2016-10-19 17:06:47 +00:00
Winson
448c0adb78 Skip getting transforms for ignored tasks. 
- If the stack does not contain the existing ignored task view on
  relayout, then we should not try and get the transform for it
  since it will be skipped.

Bug: 32001762
Change-Id: I23182c76ac41b036c25edf92374622191e9d4ce3
 2016-10-19 09:53:59 -07:00
Marie Janssen
d8e027b5a4 Bluetooth: More logging of bluetooth service state 
am: 9fa2491850

Change-Id: Idd26922caf3c1a0fb77d2091ac86bfe3a1d1c62a
 2016-10-19 16:43:09 +00:00
Marie Janssen
9fa2491850 Bluetooth: More logging of bluetooth service state 
Bug: 32140251
Bug: 32140271
Bug: 32060415

Change-Id: I50faa184551748023ea5a573646a75293f553d16
 2016-10-19 16:28:31 +00:00
Svetoslav Ganov
6a2ada0a0a Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev 
am: d48bd27f0e

Change-Id: I9fbbbbe709dbf308fa4b2678ede416e68f59c057
 2016-10-19 01:47:51 +00:00
Svetoslav Ganov
a9aa78b1fd [DO NOT MERGE] Catch a missed case when adding a toast 
am: 5c90c5e32e

Change-Id: Ie9273caa0918a95a87c5bdb26ebc80ef2d4c22c0
 2016-10-19 01:47:48 +00:00
Svetoslav Ganov
d48bd27f0e Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev 2016-10-19 01:35:37 +00:00
Chris Thornton
1696610b17 Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev 
am: 23655af585

Change-Id: Idc6e7aeef68d16a13a707968ff3805a6d87b2bc3
 2016-10-19 01:26:48 +00:00
Chris Thornton
519b7837bb Only purge sound models that violate the new primary key constraint if they don't contain identical data. 
am: d5ff116403

Change-Id: I3e205134832a7abeb4d9d2aca3b7c5600fc22239
 2016-10-19 01:26:45 +00:00
TreeHugger Robot
23655af585 Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev 2016-10-19 01:17:05 +00:00
Andrew Solovay
c86db22b2f docs: Updating the samples "what's new" for API 7.1 
"What's new" page hadn't been updated since 6.0 (18 months ago).
Replacing the old "new" sample apps with the three new ones added
for 7.1.

Doc is staged to:

http://go/dods-stage/samples/new/

bug: 32212333
Change-Id: Ibb48bb531c0d519e50d940d443b461a215ed87d7
 2016-10-19 01:16:18 +00:00
Svetoslav Ganov
b3a8fc9835 Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev 
am: 76043cf69f

Change-Id: I89c6415c45320a1825bf2bca26ec64a9e308d46d
 2016-10-19 00:42:58 +00:00
Svet Ganov
ba7bd1fe06 Validate input for ContentService#setIsSyncable 
am: 96b9c75cec

Change-Id: Ib39782e880a528be297d673134d7609e68ed313d
 2016-10-19 00:42:53 +00:00
Svetoslav Ganov
76043cf69f Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev 2016-10-19 00:33:02 +00:00
Hemal Patel
6fe03a8529 Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc am: 2a2c0fb96a 
am: b841c2d845

Change-Id: I618a5f80027a2518dd1fb93697465adf011bf442
 2016-10-18 23:17:11 +00:00
Hemal Patel
c9f68a8be3 Docs: Fixed a broken link am: 9a641b6989 am: 40aaf53920 
am: 8068fdca0c

Change-Id: Ic6d2bbcb23051f22e8a10e7d7573dc34b000f9a5
 2016-10-18 23:16:08 +00:00
Hemal Patel
b841c2d845 Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc 
am: 2a2c0fb96a

Change-Id: I52c0fc44767f3b1102a8830e9e7910bf6d0db993
 2016-10-18 23:09:58 +00:00
Hemal Patel
8068fdca0c Docs: Fixed a broken link am: 9a641b6989 
am: 40aaf53920

Change-Id: I4888353281c101f92da0ce438e64531739c332be
 2016-10-18 23:08:56 +00:00
Andrii Kulian
da3b648b64 DO NOT MERGE -- Use focused activity value when moving task back 
When task is moved back we need to adjust currently focused activity
and sent currently resumed record from ActivityStack. However if this
happens when device is locked, resumed activity record will be null.
Need to used currently focused record from service instead.

Bug: 32172829
Change-Id: I2de9bc4135663ab45af859f21e9e92562deb44d4
 2016-10-18 23:03:39 +00:00
Hemal Patel
2a2c0fb96a Merge "Docs: Fixed a broken link" into nyc-dev 
am: b361f519dc

Change-Id: I715603d2fe5f7d21b93c663dc7109d4ee5abaf74
 2016-10-18 23:01:56 +00:00
Hemal Patel
40aaf53920 Docs: Fixed a broken link 
am: 9a641b6989

Change-Id: If8e166a3cb36d158fd428e314b90cb265cf2256c
 2016-10-18 23:01:53 +00:00
Adam Lesinski
93e4720813 Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev 
am: 0858d08a88

Change-Id: Idc8f2c1685c11d301d9fb4323a21e6d14c4ae594
 2016-10-18 22:55:17 +00:00
Adam Lesinski
be75a58447 Fix regression with defaultDisplay adjustments 
am: f02523bf4b

Change-Id: I7e96a95bcb75ee0b286e73024f62391cc1b759dd
 2016-10-18 22:55:14 +00:00
Hemal Patel
b361f519dc Merge "Docs: Fixed a broken link" into nyc-dev 2016-10-18 22:54:39 +00:00
Kevin Hufnagle
68d699d100 docs: Updated ShortcutManager and ShortcutInfo class references. 
Bug: 32074598
Change-Id: I168d49a8542b411a074dc6e9120b0f08f72a829a
 2016-10-18 15:53:09 -07:00