Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,209 Commits 3 Branches 0 Tags
4fc87b1dbbdba7cd2c36139bb91b493e9d995d7a
Commit Graph

253209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
4fc87b1dbb Merge "Fixing issue with excluded task showing when docking." into nyc-dev am: caedd41a6a 
am: 60ad651c84

* commit '60ad651c8431aaeeb72bfdfe378542727a9b848f':
  Fixing issue with excluded task showing when docking.

Change-Id: Icb2c715d0ced2101c064e62f38b5108bd1da5163
 2016-05-12 23:38:35 +00:00
Winson
60ad651c84 Merge "Fixing issue with excluded task showing when docking." into nyc-dev 
am: caedd41a6a

* commit 'caedd41a6ab0f5aa3f6e289311162fd2c817926c':
  Fixing issue with excluded task showing when docking.

Change-Id: I58f58c02159442ccf0ffb53a4f04f585d59783bf
 2016-05-12 23:33:31 +00:00
Android Build Merger (Role)
9dbfb102f4 Merge "Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2 am: bd6f5fc3a0" into nyc-mr1-dev-plus-aosp 2016-05-12 23:32:20 +00:00
Yigit Boyar
39c304f7d3 Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2 
am: bd6f5fc3a0

* commit 'bd6f5fc3a0ae408fe1a0a249025f6f2262c22aa7':

Change-Id: I3cf489fedc129aff5917c1c66333e58656440bbd
 2016-05-12 23:31:57 +00:00
Android Build Merger (Role)
e5675debc6 Merge "Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2 am: bd6f5fc3a0" into nyc-mr1-dev-plus-aosp 2016-05-12 23:30:25 +00:00
Yigit Boyar
fc31986014 Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2 
am: bd6f5fc3a0

* commit 'bd6f5fc3a0ae408fe1a0a249025f6f2262c22aa7':
  Respect add focusables flags

Change-Id: Ic9cacc26ad9bb2036e2b9de4a325ecb423514648
 2016-05-12 23:29:55 +00:00
Yigit Boyar
734ca44a24 Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2 
am: 16b53c67c1

* commit '16b53c67c1be40c13359612397de19995812decc':
  Respect add focusables flags

Change-Id: If08aa608fb9e77b391bf8b68be50caf438305ae9
 2016-05-12 23:29:53 +00:00
Yigit Boyar
16b53c67c1 Merge "Respect add focusables flags" into nyc-dev 
am: 4c6eeb67a2

* commit '4c6eeb67a232fdbca43513d8414e38a55c40d75e':
  Respect add focusables flags

Change-Id: I63af32dd31750d8af612a4c562ec1e1930129151
 2016-05-12 23:27:19 +00:00
Yigit Boyar
bd6f5fc3a0 Merge "Respect add focusables flags" into nyc-dev 
am: 4c6eeb67a2

* commit '4c6eeb67a232fdbca43513d8414e38a55c40d75e':
  Respect add focusables flags

Change-Id: I8bb85f17fa0d85ae9d58aa026711e298c1b0f09a
 2016-05-12 23:27:19 +00:00
Android Build Merger (Role)
9923dd7ef0 Merge "docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d am: a23a2c7de6 am: 0d3ff75c06" into nyc-mr1-dev-plus-aosp 2016-05-12 23:25:05 +00:00
Cheryl Potter
73357d85b3 docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d am: a23a2c7de6 
am: 0d3ff75c06

* commit '0d3ff75c0661e6ed28949bedb3ebf785295ae0eb':

Change-Id: I3b2a365e222782883fdaaa92ac48c70ef9c8eb1d
 2016-05-12 23:24:44 +00:00
Android Build Merger (Role)
1a291f9a40 Merge "docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d am: a23a2c7de6 am: 0d3ff75c06" into nyc-mr1-dev-plus-aosp 2016-05-12 23:23:08 +00:00
Winson Chung
caedd41a6a Merge "Fixing issue with excluded task showing when docking." into nyc-dev 2016-05-12 23:22:55 +00:00
Cheryl Potter
da4870edaa docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d am: a23a2c7de6 
am: 0d3ff75c06

* commit '0d3ff75c0661e6ed28949bedb3ebf785295ae0eb':
  docs: Add Emulator Console authentication feature

Change-Id: Ia6d291707615d832c6a746d1a8decbf46c540b1e
 2016-05-12 23:22:44 +00:00
Cheryl Potter
33345436b6 docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d am: a23a2c7de6 
am: 2ee6a1a9a1

* commit '2ee6a1a9a1cb109744176646857af603f4996ed2':
  docs: Add Emulator Console authentication feature

Change-Id: If2863412842b23c10fcfb4c539707557f37c9ed4
 2016-05-12 23:22:42 +00:00
Cheryl Potter
2ee6a1a9a1 docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d 
am: a23a2c7de6

* commit 'a23a2c7de60d12eea4a3009491289e7f5ef844c0':
  docs: Add Emulator Console authentication feature

Change-Id: Ia1ac8edc4cd31f9c22dce9c3071b4a57b1e078ac
 2016-05-12 23:20:21 +00:00
Cheryl Potter
0d3ff75c06 docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d 
am: a23a2c7de6

* commit 'a23a2c7de60d12eea4a3009491289e7f5ef844c0':
  docs: Add Emulator Console authentication feature

Change-Id: I6c1cd651f3b1d9b7ef444cb133cf10544a344064
 2016-05-12 23:20:16 +00:00
Yigit Boyar
4c6eeb67a2 Merge "Respect add focusables flags" into nyc-dev 2016-05-12 23:19:22 +00:00
Cheryl Potter
a23a2c7de6 docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 am: f0e6b1ae83 
am: a32ad7464d

* commit 'a32ad7464d85b6db2f070e7154c92facef99b4ea':
  docs: Add Emulator Console authentication feature

Change-Id: I2817d6974c0d2fc105ce787d0bbae92e147cf704
 2016-05-12 23:17:58 +00:00
Cheryl Potter
a32ad7464d docs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262 
am: f0e6b1ae83

* commit 'f0e6b1ae83bf62b54864c9ddf63d7a76e17dc122':
  docs: Add Emulator Console authentication feature

Change-Id: I81aa710f3e502cdc9c0de211d21e338f5ca5edd7
 2016-05-12 23:15:36 +00:00
Cheryl Potter
f0e6b1ae83 docs: Add Emulator Console authentication feature am: baa20c572c -s ours 
am: f8ec668262

* commit 'f8ec6682627d1e1d00df60a975451412f558e787':
  docs: Add Emulator Console authentication feature

Change-Id: I326c71760e0f64d328125218f5a63f891dc66269
 2016-05-12 23:13:12 +00:00
Android Build Merger (Role)
2077a13cf2 Merge "Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev am: 8fde916de8 am: c3b0c1f304" into nyc-mr1-dev-plus-aosp 2016-05-12 23:11:03 +00:00
Cheryl Potter
f8ec668262 docs: Add Emulator Console authentication feature 
am: baa20c572c  -s ours

* commit 'baa20c572cffec2b508e5d0cd4194e39303441ae':
  docs: Add Emulator Console authentication feature

Change-Id: I758620f266d31157ab304147818c3c996498402d
 2016-05-12 23:10:46 +00:00
Chen Xu
3cb317cdcf Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev am: 8fde916de8 
am: c3b0c1f304

* commit 'c3b0c1f304d47b33bc672ee84b2d0b1381da431a':

Change-Id: Ib4838e55e786fd9596e6401931ca5ea862075d8e
 2016-05-12 23:10:34 +00:00
Android Build Merger (Role)
4fa83f0b95 Merge "Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev am: 8fde916de8 am: c3b0c1f304" into nyc-mr1-dev-plus-aosp 2016-05-12 23:09:01 +00:00
Chen Xu
9ec8371918 Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev am: 8fde916de8 
am: c3b0c1f304

* commit 'c3b0c1f304d47b33bc672ee84b2d0b1381da431a':
  disable wifi only mode from wfc setting for nyc

Change-Id: I7eeb353dbc6d19d83392d49afd27101f9384bc40
 2016-05-12 23:08:40 +00:00
Chen Xu
9d8566d361 Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev am: 8fde916de8 
am: ea88c4c2fa

* commit 'ea88c4c2fa5530423e658e51f4df01ef79e4d3cc':
  disable wifi only mode from wfc setting for nyc

Change-Id: I85d954b030b0576d0bb3e9fa9d4e256e51ad3570
 2016-05-12 23:08:34 +00:00
fionaxu
c3b0c1f304 Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev 
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
  disable wifi only mode from wfc setting for nyc

Change-Id: I3083a247a81dcb22042791a7df7c54f3a3484958
 2016-05-12 23:05:57 +00:00
fionaxu
ea88c4c2fa Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev 
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
  disable wifi only mode from wfc setting for nyc

Change-Id: Ie74e4e0017ce4d514d5d458e05c2b226164a3bb6
 2016-05-12 23:05:55 +00:00
Chen Xu
8fde916de8 Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev 2016-05-12 22:57:40 +00:00
Steve Pomeroy
54bb5dbd65 Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e am: b654fae4db 
am: 88968cc3ba

* commit '88968cc3baefc453d3564ca1546ae87adbbd1f31':
  Fix documentation bug in SQLiteDatabase

Change-Id: I67d580b53b8fb34ab4c7cbe0bd6dda7e31895e51
 2016-05-12 22:34:02 +00:00
Steve Pomeroy
88968cc3ba Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e 
am: b654fae4db

* commit 'b654fae4dbff8b384ef3074ff762f0ed5b8b1034':
  Fix documentation bug in SQLiteDatabase

Change-Id: I8917758d9d0a41105be1adc596d3468cff22c739
 2016-05-12 22:31:52 +00:00
Steve Pomeroy
d88ca0e659 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902 
am: b6c826227d

* commit 'b6c826227dfbc1cdb565098a9df5b897dd1137f3':
  ContentValues: improve documentation

Change-Id: I6a3f730971777a19460f9afeafca1878c4fd522d
 2016-05-12 22:29:25 +00:00
Steve Pomeroy
b654fae4db Merge "Fix documentation bug in SQLiteDatabase" 
am: 21d061ec2e

* commit '21d061ec2e1a097b8759c55e2368ffa6024b6f92':
  Fix documentation bug in SQLiteDatabase

Change-Id: I986c5024e1c4843ec891ffb76f467e42aacb89f6
 2016-05-12 22:29:22 +00:00
Steve Pomeroy
b6c826227d Merge "ContentValues: improve documentation" am: b44d4207c1 
am: 78e5a04902

* commit '78e5a0490278bc12cb7e3c12225aba05639c922f':
  ContentValues: improve documentation

Change-Id: Ifce0816dc5565e6b7944de92ee814f97cb4753b6
 2016-05-12 22:27:12 +00:00
Treehugger Robot
21d061ec2e Merge "Fix documentation bug in SQLiteDatabase" 2016-05-12 22:25:20 +00:00
Steve Pomeroy
78e5a04902 Merge "ContentValues: improve documentation" 
am: b44d4207c1

* commit 'b44d4207c1dc2131e022ddcad74be6d121a51b5e':
  ContentValues: improve documentation

Change-Id: I6c50514fa7b3531da96364d5624e3b093b984007
 2016-05-12 22:24:41 +00:00
Cheryl Potter
baa20c572c docs: Add Emulator Console authentication feature 
Change-Id: I77c36a71a208714443e09b10caf5e35141afca95
 2016-05-12 15:18:45 -07:00
Treehugger Robot
b44d4207c1 Merge "ContentValues: improve documentation" 2016-05-12 22:17:32 +00:00
Yigit Boyar
4c6e983000 Respect add focusables flags 
This CL fixes 2 bugs in View's addFocusables implementations.

1) addFocusables(list, dir) method was always returning focusables in
touch mode even if the device is not in touch mode.

2) addFocusables(list, dir, mode) was not respecting the provided mod.

Bug: 28745577
Change-Id: I9b9e5af27f8f5b1bb3cc601584fdad7c73e54a5d
 2016-05-12 15:11:13 -07:00
Android Build Merger (Role)
c286c64b2b Merge "Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 am: 647058d499 am: 085933cc8f" into nyc-mr1-dev-plus-aosp 2016-05-12 22:10:36 +00:00
Android Build Merger (Role)
aa22928a95 Merge "Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 am: 647058d499 am: 4c80554405" into nyc-mr1-dev-plus-aosp 2016-05-12 22:10:33 +00:00
Android Build Merger (Role)
3895e59548 Merge "Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 0513394f85" into nyc-mr1-dev-plus-aosp 2016-05-12 22:10:25 +00:00
smain@google.com
30f1635fd2 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 am: 647058d499 
am: 085933cc8f

* commit '085933cc8fa0b06d28161ddc001c20282012f263':
  missed another old link

Change-Id: I0a9b6823bc94b068be4026e6f9137bcdb62f87d2
 2016-05-12 22:10:14 +00:00
smain@google.com
f436b21bc3 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 am: 647058d499 
am: 4c80554405

* commit '4c8055440553ab92e362096035e1c86dad33cf91':
  missed another old link

Change-Id: I3facd0c8d3880a99a6b4e1739736d3df210025a8
 2016-05-12 22:10:00 +00:00
Philip Cuadra
441608e385 Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df 
am: 0513394f85

* commit '0513394f85385d6bfa7866f1a958b038dc2826d9':

Change-Id: Id9e4af09c566d57a613ff05999c4c14bfcf59388
 2016-05-12 22:09:57 +00:00
Android Build Merger (Role)
4a8f48446c Merge "Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 0513394f85" into nyc-mr1-dev-plus-aosp 2016-05-12 22:08:20 +00:00
Philip Cuadra
e47be8cd79 Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df 
am: 0513394f85

* commit '0513394f85385d6bfa7866f1a958b038dc2826d9':
  Pinner service for pinning files into memory

Change-Id: I85715567c54212669898b29c64309a548518a595
 2016-05-12 22:07:55 +00:00
Philip Cuadra
d49592805f Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df 
am: 5fcabe19a7

* commit '5fcabe19a76a06d25358e9889323353f72a94547':
  Pinner service for pinning files into memory

Change-Id: Ia7dc78c32f2beb9c16bf15ac41defc63e51be0e1
 2016-05-12 22:07:43 +00:00
Scott Main
4c80554405 Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67 
am: 647058d499

* commit '647058d49975c49123f66c8f7ea127cfc6ca7def':
  missed another old link

Change-Id: Ief64115701727aad73cc320af1768075a0c2cfa2
 2016-05-12 22:07:30 +00:00