Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sid Soundararajan
436da616c8 Merge "Alternate method for adding dismiss in talkback" into nyc-dev 2016-05-25 22:23:05 +00:00
Amanda Kassay
2a301e8fc6 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe am: a475ff360c am: 29b04437b1 am: 35bba73387 
am: 0c69c05125

* commit '0c69c051255ed93b2e430066dd3c386ce2cc4d15':

Change-Id: I0236eaa1edede8ddd635d353a37d8935495aa187
 2016-05-25 22:18:37 +00:00
Eric Schmidt
47f85f1bed Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c am: 3c2709c6b7 am: 31e070a1b3 am: 0e4415bc72 
am: 5399b03877

* commit '5399b03877afd98df70257b326c8f63c09aae306':

Change-Id: I6f0aa806e9413709928bf87ad8d5f763d37cde2e
 2016-05-25 22:18:30 +00:00
Amanda Kassay
a713ffedee Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe am: a475ff360c am: 29b04437b1 am: 151c74146e 
am: cb57cbbf9f

* commit 'cb57cbbf9fdc982f273c63e75e6219e9709676e3':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I80823be5a5ed9043d2b13334d0b251a2ecc7df6f
 2016-05-25 22:18:19 +00:00
Eric Schmidt
6ac6ba9be0 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c am: 3c2709c6b7 am: 31e070a1b3 am: c6ff5315b6 
am: caddf00f6b

* commit 'caddf00f6b3730b4eda8db58eaf7731fa3140e58':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: I551f7ae9d04130d81b7b04b9b7936aaec3f2d736
 2016-05-25 22:18:07 +00:00
Antonio Cansado
c45f0aea71 Merge "Cleaning up NetworkStatsManager." into nyc-dev 2016-05-25 22:17:21 +00:00
Android Build Merger (Role)
4d0bc67a79 Merge "Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 am: 1a6f583c20" into nyc-mr1-dev-plus-aosp 2016-05-25 22:13:58 +00:00
Siyamed Sinir
537b6f796f Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 
am: 1a6f583c20

* commit '1a6f583c20034ef2e7bd80dfecd77db5cad44dfe':
  Fix TextView layout reuse when maxLines is set

Change-Id: I3840fc0ad218103049924a958c67f69205205899
 2016-05-25 22:13:32 +00:00
Siyamed Sinir
1f4c99f7d8 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 
am: baf8284c62

* commit 'baf8284c62e708a2d7817319c9e5f8948f6e5f5f':
  Fix TextView layout reuse when maxLines is set

Change-Id: I0334f59dee1599a77c216a0a18e030247a41e55f
 2016-05-25 22:13:28 +00:00
Siyamed Sinir
baf8284c62 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 
am: e747160509

* commit 'e747160509e71a05430168b1c8a28400b6a18403':
  Fix TextView layout reuse when maxLines is set

Change-Id: I7f1d3acb519a91388dbf03db28ee039b5d4b7b1c
 2016-05-25 22:09:31 +00:00
Doris Ling
5b2c0ad312 Added new action for gesture settings. 
Added new event for Settings -> Gestures

Bug: 28565958
Change-Id: I126ab29cf312b09cad1bd86cf614019616642536
 2016-05-25 15:08:29 -07:00
Siyamed Sinir
1a6f583c20 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 
am: e747160509

* commit 'e747160509e71a05430168b1c8a28400b6a18403':
  Fix TextView layout reuse when maxLines is set

Change-Id: Iaf30b66b1a328f34d31efe723e394d817f74d65f
 2016-05-25 22:08:22 +00:00
Michael Kwan
6830331a18 Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev am: e7f634f416 
am: 76501fed59

* commit '76501fed5978d7eb7412877891194ff89a9a6720':
  Update EditText break strategy for Theme.Micro.

Change-Id: I18c9c8de4d8fc105672cb550184982fa59840e23
 2016-05-25 22:05:27 +00:00
Amanda Kassay
0c69c05125 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe am: a475ff360c am: 29b04437b1 
am: 35bba73387

* commit '35bba73387fcab2c6e800a67b3d8dea46d63cdcb':

Change-Id: I957ff5e128a8806f38fe125f3e845b745ac872fd
 2016-05-25 22:05:04 +00:00
Eric Schmidt
5399b03877 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c am: 3c2709c6b7 am: 31e070a1b3 
am: 0e4415bc72

* commit '0e4415bc72eff36ef1950f7f4581291c5004b320':

Change-Id: Iecdc035b7de17daa7cca5476c9842b7a0be7c1ed
 2016-05-25 22:04:59 +00:00
Junda Liu
e809dc3b68 Merge "Add restricted card state to telephony manager." into nyc-mr1-dev am: ea97857a78 
am: ec319efbd5

* commit 'ec319efbd55286979a9e17cbb1b69486abb8adb8':
  Add restricted card state to telephony manager.

Change-Id: I5239047a17f795a8f6f2ff5d9982d3757c22e3bb
 2016-05-25 22:04:10 +00:00
Alan Viverette
4428fe9f5c Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev am: 29c01336db am: f2c95b865e 
am: 247fa7c875

* commit '247fa7c875bd5da0cd88eb590132fb77395dea73':

Change-Id: I157667a8aea5603e601121f7924ef59583ec6f28
 2016-05-25 22:03:56 +00:00
Siyamed Sinir
e747160509 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 2016-05-25 22:03:06 +00:00
Amanda Kassay
cb57cbbf9f Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe am: a475ff360c am: 29b04437b1 
am: 151c74146e

* commit '151c74146e6e8b4570e5de2a8f557fe6cce8098b':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I4922db48526cf8b786009ba782ed68f33682baef
 2016-05-25 22:02:34 +00:00
Eric Schmidt
caddf00f6b Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c am: 3c2709c6b7 am: 31e070a1b3 
am: c6ff5315b6

* commit 'c6ff5315b6fb8aefb7dea15d6a51a00b71074729':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: I97c9efc934e5cb59eb910e1ebd8be9f02186a519
 2016-05-25 22:02:23 +00:00
Christopher Wiley
f54c5a932a Consolidate cleanup logic in TetherInterfaceSM.TetheredState 
This pushes all TetheredState cleanup logic into a single place.
All new unittests fail without the changes to TetherInterfaceSM.

Bug: 28915272
Test: Compiles, unittests pass, WiFi tethering continues to work.

Change-Id: Ia7bf210e00e9a54f2797baebc2e5333ce314c947
 2016-05-25 14:59:07 -07:00
Christopher Wiley
d905add474 Annotate TetherInterfaceStateMachineTest for APCT 
APCT needs a little additional magic to pick up JUnit4 tests.

Bug: 28958508
Test: Tests continue to pass

Change-Id: Ia45d91bb3b06e60e3a46ffe738d4468356e066b3
 2016-05-25 14:59:06 -07:00
Michael Kwan
76501fed59 Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev 
am: e7f634f416

* commit 'e7f634f4164733ebf6872b31de8dcfe02885e3d4':
  Update EditText break strategy for Theme.Micro.

Change-Id: I8d6b567bad7c59ece17c8663bc496f3047da7ac1
 2016-05-25 21:58:13 +00:00
Amanda Kassay
151c74146e Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe am: a475ff360c 
am: 29b04437b1

* commit '29b04437b18402abefb40e696adf6434db0bf914':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I1c53f8121ee43691354d66885e6c1c71c777c959
 2016-05-25 21:56:35 +00:00
Eric Schmidt
c6ff5315b6 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c am: 3c2709c6b7 
am: 31e070a1b3

* commit '31e070a1b35bf3658f8a803eeabe094ec1b2d826':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: If3669044623c465e5797eae64899042f3e5a9d00
 2016-05-25 21:56:31 +00:00
Amanda Kassay
35bba73387 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe am: a475ff360c 
am: 29b04437b1

* commit '29b04437b18402abefb40e696adf6434db0bf914':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I519500567900c72b1a91315f73e9ec5bb6600350
 2016-05-25 21:56:30 +00:00
Eric Schmidt
0e4415bc72 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c am: 3c2709c6b7 
am: 31e070a1b3

* commit '31e070a1b35bf3658f8a803eeabe094ec1b2d826':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: Iab4d84ece149983884f3292f40312104cb81b85c
 2016-05-25 21:56:26 +00:00
Fyodor Kupolov
ac06a4907b Remove ActivityManager calls with PM.mInstallLock held 
UserController now pushes user state to UMS.

PM now checks user running/unlocking/unlocked state by calling
UserManagerInternal.

Bug: 28090199
Change-Id: I20e62b37f78238f28dd81f49f876732bbd3c6b34
 2016-05-25 14:55:09 -07:00
Alan Viverette
f9d8433bf0 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: 72c2aec394 
am: c9c95aa244

* commit 'c9c95aa244a0d3223f3d3751606e6e86f5875909':
  Fix DatePicker.setMin/MaxDate()

Change-Id: I5a45259ee1a21667d72f216b5b394e6450c2d03f
 2016-05-25 21:50:36 +00:00
Junda Liu
ec319efbd5 Merge "Add restricted card state to telephony manager." into nyc-mr1-dev 
am: ea97857a78

* commit 'ea97857a7868467a5cbe986807d04854cc4c3442':
  Add restricted card state to telephony manager.

Change-Id: I800619a54e75424d6dbb723216ae250ec6276e41
 2016-05-25 21:50:29 +00:00
Alan Viverette
247fa7c875 Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev am: 29c01336db 
am: f2c95b865e

* commit 'f2c95b865edadeca62e55bcbe963e8780acd68d4':

Change-Id: Iebca7dff13fa5602f17116460e08fdb8fbce06f2
 2016-05-25 21:50:18 +00:00
Amanda Kassay
29b04437b1 Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs am: cb3ae33cfe 
am: a475ff360c

* commit 'a475ff360c9457ecbef6af97ca7228dc9cd5c139':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: Ibe99c1f7e47acacf7b60f8ad66a7a3d658776413
 2016-05-25 21:50:13 +00:00
Eric Schmidt
31e070a1b3 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am: 5548a7c59c 
am: 3c2709c6b7

* commit '3c2709c6b7b40f0a31674a775f891ca4e198cfa5':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: Ib072e701b8793baba0c9da9a24748dc89b1dae55
 2016-05-25 21:50:00 +00:00
Michael Kwan
e7f634f416 Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev 2016-05-25 21:46:27 +00:00
Miao Wang
6aaede8cd7 [RenderScript] Fix ScriptIntrinsicBlur documentation. 
Bug: 28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
(cherry picked from commit c242fa6b5d)
 2016-05-25 14:44:10 -07:00
TreeHugger Robot
620364ad95 Merge "Separate paste code from DirectoryFragment." 2016-05-25 21:42:34 +00:00
Junda Liu
ea97857a78 Merge "Add restricted card state to telephony manager." into nyc-mr1-dev 2016-05-25 21:39:12 +00:00
Miao Wang
1641dc9e68 Update documentation about copyTo and copyFrom. 
Bug: 23159764
Bug: 26862970

  - Add detailed description of AutoPadding
  - Add comments to all the copy related APIs.
  - Fix typos in the comments.

Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9
(cherry picked from commit 3231e8e022)
 2016-05-25 14:38:43 -07:00
Robin Lee
024296778a Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: 30c63961dd" into nyc-mr1-dev-plus-aosp 
am: 71363f6c78

* commit '71363f6c7857b893c34ac016e7675a1e002e7316':

Change-Id: Icfb0bcb2ec831c80303bc10747c84ebed606d607
 2016-05-25 21:38:32 +00:00
Robin Lee
67580e5874 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: ef7e644fc5 
am: 62f3b9286d

* commit '62f3b9286df6cd8361d967910b91c63916e931fd':
  Return legacy VPN info regardless of lockdown mode

Change-Id: Ifff21798ff23d1906810d23393efc3e0cad14941
 2016-05-25 21:37:36 +00:00
Danny Epstein
8305af34c5 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 am: c8a35d64c6 
am: c9eb2c47b1

* commit 'c9eb2c47b1d133fab1ccfa82ba722d0c27581910':
  Left and right margins for watch preferences.

Change-Id: I78b69b3d952370bfc845cd93c35cd16c5817f8f3
 2016-05-25 21:37:06 +00:00
Amanda Kassay
a475ff360c Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 
am: cb3ae33cfe

* commit 'cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I33fec5a25e6648db7b6fd0da06794c0ce7bd8ed5
 2016-05-25 21:35:54 +00:00
Eric Schmidt
3c2709c6b7 Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs 
am: 5548a7c59c

* commit '5548a7c59cf6a41095c72189fee7e522b5cab8f1':
  docs: Instant Apps broken link, wonky video thumbnail

Change-Id: I08d7e4c62072bffd01db4f1192cadbc1d033306b
 2016-05-25 21:35:43 +00:00
Robin Lee
c9c95aa244 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 
am: 72c2aec394

* commit '72c2aec394f6cb06e0c61d0da15a93bfcacbdc51':
  Fix DatePicker.setMin/MaxDate()

Change-Id: Iab6ef414116d6bec4cf418d784de4c0797e5dbd4
 2016-05-25 21:33:20 +00:00
Android Build Merger (Role)
71363f6c78 Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: 30c63961dd" into nyc-mr1-dev-plus-aosp 2016-05-25 21:29:56 +00:00
Robin Lee
62f3b9286d Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 
am: ef7e644fc5

* commit 'ef7e644fc5ce23768cf11c2b397c7938a0971992':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I74b7cb240b959a8c67b8967b4a78338eb80f6a81
 2016-05-25 21:28:27 +00:00
Robin Lee
aa2b8360a3 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 
am: 30c63961dd

* commit '30c63961dd12fb5b8e3565bebc86c0c7a5faaa54':
  Return legacy VPN info regardless of lockdown mode

Change-Id: Icc8867a0ea3024c189aff10e2b903fac0dab2092
 2016-05-25 21:28:21 +00:00
Android Build Merger (Role)
cb3ae33cfe Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am: c68d8768c8" into mnc-io-docs 2016-05-25 21:28:20 +00:00
Alan Viverette
f2c95b865e Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 
am: 29c01336db

* commit '29c01336db4b2db5582904597559b14563543054':
  Fix DatePicker.setMin/MaxDate()

Change-Id: Ief9107dfd244cb2bad45e0d6f3e183dc2d1fbd11
 2016-05-25 21:28:07 +00:00
Alan Viverette
72c2aec394 Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 
am: 29c01336db

* commit '29c01336db4b2db5582904597559b14563543054':
  Fix DatePicker.setMin/MaxDate()

Change-Id: I34440f70e6771a6e97cd46e78548167f02bb5e82
 2016-05-25 21:28:06 +00:00