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

148870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandeep Siddhartha
a8054cfe3c am 73d5dc67: am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '73d5dc67665778a5cf01dc0cb0d586e57834c991':
  Fix build break
 2014-08-08 02:21:29 +00:00
Sandeep Siddhartha
38bbb59676 am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '969edb82edfafbf49792ca9e383c99697329ab27':
  Fix build break
 2014-08-08 00:53:23 +00:00
Winson Chung
38c010dd05 am 06e564d2: am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit '06e564d23309dc1c5198eda98e975b7fc5f00c61':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 19:17:19 +00:00
Glenn Kasten
b8ade1e976 am 7bffa188: am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit '7bffa188c6cfc180b0efea2e7d00b73088acb875':
  Add setting to disable automatic USB audio routing
 2014-08-07 19:17:14 +00:00
Sandeep Siddhartha
0cb13caff6 am b8086b66: am 7e0e4515: am e931a72d: Handle same keyphrase for multiple users 
* commit 'b8086b6676fc9e086d2128c028a8223a2618affa':
  Handle same keyphrase for multiple users
 2014-08-07 19:17:09 +00:00
Sandeep Siddhartha
4f5e1baa11 am 2c28164d: am 84e8121f: am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev 
* commit '2c28164df8c56ff26b4b0f045d40fb756697b44d':
  Read audio format from the recognition event
 2014-08-07 19:17:05 +00:00
Adam Powell
0ee1e2436e am a653ca15: am 0ae66be2: am 157fab0c: Nested pre-fling for AbsListView and ScrollView 
* commit 'a653ca1573f13a496d2fe163f2c1d58523a8fa41':
  Nested pre-fling for AbsListView and ScrollView
 2014-08-07 19:17:00 +00:00
Winson Chung
c51d50c4db am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit 'e70eb503d1798fe391eae9c84050092e510234fc':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 19:07:42 +00:00
Glenn Kasten
4552829ae0 am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit 'fc7524257aedf685908528c778843294d4e07da1':
  Add setting to disable automatic USB audio routing
 2014-08-07 19:07:37 +00:00
Sandeep Siddhartha
4d72ebe642 am 7e0e4515: am e931a72d: Handle same keyphrase for multiple users 
* commit '7e0e4515db07858254c04a2a347b4758689d4615':
  Handle same keyphrase for multiple users
 2014-08-07 19:07:32 +00:00
Sandeep Siddhartha
6c10af5c2c am 84e8121f: am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev 
* commit '84e8121f7bc0b5981052462800e5e35b18876d87':
  Read audio format from the recognition event
 2014-08-07 19:07:27 +00:00
Adam Powell
e5d01bf717 am 0ae66be2: am 157fab0c: Nested pre-fling for AbsListView and ScrollView 
* commit '0ae66be2d2e78be5f3b21f1592ee421c10ac5ca3':
  Nested pre-fling for AbsListView and ScrollView
 2014-08-07 19:07:02 +00:00
Sandeep Siddhartha
70833478dd am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '5885981af5d3a146c3f9a532b112b02a5e389398':
  Fix build break
 2014-08-07 18:32:41 +00:00
Winson Chung
58865b6797 am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit 'f9c1251b0ca90467a0532b84fc95448e10ccfb95':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 18:06:38 +00:00
Glenn Kasten
27ee1046a4 am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit 'cd55d2e5e19eb62712c023c5eb434c096d701a26':
  Add setting to disable automatic USB audio routing
 2014-08-07 18:02:27 +00:00
Sandeep Siddhartha
e849e4aaec am e931a72d: Handle same keyphrase for multiple users 
* commit 'e931a72dcdaa01f1f4f9011472d15229cd1cfc82':
  Handle same keyphrase for multiple users
 2014-08-07 17:58:01 +00:00
Sandeep Siddhartha
ac23293c2d am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev 
* commit 'b6c0b037035bfea56de1d158fe9f1d42f0e35bca':
  Read audio format from the recognition event
 2014-08-07 17:57:56 +00:00
Sandeep Siddhartha
256e1a6267 Handle same keyphrase for multiple users 
Also notify the VIS of a change after finishing the change

Bug: 16816191
Change-Id: I6c96595819cd07182c3825c522d9bae559bb6814
 2014-08-07 10:50:18 -07:00
Adam Powell
86874c8b57 am 157fab0c: Nested pre-fling for AbsListView and ScrollView 
* commit '157fab0c71afa7b4dfb44a5d6cbb2a117cbf73a3':
  Nested pre-fling for AbsListView and ScrollView
 2014-08-07 17:31:35 +00:00
Adam Powell
9413b245a6 Nested pre-fling for AbsListView and ScrollView 
Add nested pre-fling support to all framework widgets that currently
support nested fling.

Change-Id: Ieaf9d12938dbfeea779c2aee2f5a081c287c8e96
 2014-08-07 10:24:04 -07:00
Jae Seo
f8032fcfbe am 25d5338e: am ba3eead4: am 5616fe8d: TIF: Do not log non-searchable channel watch history 
* commit '25d5338eea3cea8ccff8f1793f3f6a4d7875895d':
  TIF: Do not log non-searchable channel watch history
 2014-08-07 17:14:28 +00:00
Jae Seo
8523e32e9c am ba3eead4: am 5616fe8d: TIF: Do not log non-searchable channel watch history 
* commit 'ba3eead4616b55491ed385769c6a1180a15f18f1':
  TIF: Do not log non-searchable channel watch history
 2014-08-07 17:10:45 +00:00
Kenny Guy
3bf8cde681 am 7fe2cf88: am adc7bb3f: am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev 
* commit '7fe2cf88f658408cb86425606f2a4b424b27e276':
  Revert "Remove String version of getBadgedLabel"
 2014-08-07 17:10:25 +00:00
Jae Seo
f1402043d1 am 5616fe8d: TIF: Do not log non-searchable channel watch history 
* commit '5616fe8d4bf9751648670c44d95dd68d01633973':
  TIF: Do not log non-searchable channel watch history
 2014-08-07 17:05:11 +00:00
Kenny Guy
69cdcabdd3 am adc7bb3f: am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev 
* commit 'adc7bb3fe5854cf532255dd0097337291fbe2e57':
  Revert "Remove String version of getBadgedLabel"
 2014-08-07 17:04:01 +00:00
Jae Seo
579befecb2 TIF: Do not log non-searchable channel watch history 
Bug: 16798476
Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
 2014-08-07 10:00:52 -07:00
Kenny Guy
10f171ff7c am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev 
* commit 'd9b5ffbcbdddd70158280602db3d2cfa4a31cd4a':
  Revert "Remove String version of getBadgedLabel"
 2014-08-07 16:58:42 +00:00
Ricardo Cervera
0ad3a919db am 3a0637fc: am 306b4c50: am 28e8ec9f: am 8f16c065: am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '3a0637fc666ecee3bcfc0bc5330b502acfd0ef9b':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:26:53 +00:00
Kenny Guy
a1b2a1e732 am deff5997: am 7f153ded: am 1f98d304: Remove LauncherApps method left for compat. 
* commit 'deff599796014960b03a817e8b6732d35665df08':
  Remove LauncherApps method left for compat.
 2014-08-07 16:26:46 +00:00
Ricardo Cervera
0587e1a029 am 306b4c50: am 28e8ec9f: am 8f16c065: am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '306b4c504cc0c32aa5754d30e8bb126159b85606':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:21:32 +00:00
Dan Sandler
165e357a70 am 5f860747: am be100df4: am e23d301e: Merge "Link to new app notification settings from the inspector." into lmp-dev 
* commit '5f8607470887ff189c0660c83c9d99a98065134c':
  Link to new app notification settings from the inspector.
 2014-08-07 16:21:31 +00:00
Kenny Guy
25dc5f6f85 am 7f153ded: am 1f98d304: Remove LauncherApps method left for compat. 
* commit '7f153ded62dbe3bf45997cbbce85751aa631a84c':
  Remove LauncherApps method left for compat.
 2014-08-07 16:21:28 +00:00
Kenny Guy
db02e7b718 am 8a2d844e: am 1c06b2d0: am 6cfeb8dc: Merge "Remove String version of getBadgedLabel" into lmp-dev 
* commit '8a2d844eb8cad6dc4ef65ebe333319aeb6899245':
  Remove String version of getBadgedLabel
 2014-08-07 16:21:26 +00:00
Dan Sandler
dd2fe93023 am be100df4: am e23d301e: Merge "Link to new app notification settings from the inspector." into lmp-dev 
* commit 'be100df471c2fb1545b88eaa7fed5f41f5c02442':
  Link to new app notification settings from the inspector.
 2014-08-07 16:17:22 +00:00
Robert Ly
897f221332 am 179ac1db: am 89a75772: am 3b3f443a: am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '179ac1db5bc72cfce17d242de5927699cffca316':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:17:18 +00:00
Kenny Guy
7d8026089d am 1c06b2d0: am 6cfeb8dc: Merge "Remove String version of getBadgedLabel" into lmp-dev 
* commit '1c06b2d0093dca6cdf02f69ccb6add623812784d':
  Remove String version of getBadgedLabel
 2014-08-07 16:17:17 +00:00
Ricardo Cervera
28fc0ec798 am 28e8ec9f: am 8f16c065: am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '28e8ec9f921bfca69c80dc9346a16c50028c3d6b':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:16:53 +00:00
Kenny Guy
717e32906c am 1f98d304: Remove LauncherApps method left for compat. 
* commit '1f98d3047688e9ad51e1afc3cea842ad68914585':
  Remove LauncherApps method left for compat.
 2014-08-07 16:16:48 +00:00
Ricardo Cervera
bdad288c96 am 8f16c065: am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '8f16c0655eb4e7321f346ed62d9068ebc9fdc35b':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:13:09 +00:00
Robert Ly
d39ccbf7fa am 89a75772: am 3b3f443a: am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '89a7577290097d042bfe34cb4dd99de0122d0a16':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:12:54 +00:00
Dan Sandler
11451ff400 am e23d301e: Merge "Link to new app notification settings from the inspector." into lmp-dev 
* commit 'e23d301e267c320e7e7c103d3d630e09487b3c02':
  Link to new app notification settings from the inspector.
 2014-08-07 16:12:39 +00:00
Kenny Guy
9df035b1aa am 6cfeb8dc: Merge "Remove String version of getBadgedLabel" into lmp-dev 
* commit '6cfeb8dcad12cdc3391b2f39c366ab339a6b1a06':
  Remove String version of getBadgedLabel
 2014-08-07 16:12:35 +00:00
Kenny Guy
65810072d6 Remove LauncherApps method left for compat. 
Method was left while updating unbundled apps
which have now been updated.

Bug: 16864685
Change-Id: I687cb23a1b60b88eeb988f3cf2604dc24b739121
 2014-08-07 16:09:10 +00:00
Robert Ly
03b1c44ea6 am 3b3f443a: am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '3b3f443a7154a4c6b69445437e0b4e376ad66297':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:08:16 +00:00
Ricardo Cervera
8f16c0655e am 35b08bac: am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit '35b08bacc4e4ab937a5179b5b991f6509127f517':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:07:37 +00:00
Robert Ly
e915faa1d4 am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '001e30729a7e12bef238df680626042b2e99d807':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 16:04:07 +00:00
Ricardo Cervera
35b08bacc4 am edcf7c51: Merge "docs: Simplify and update the Signing page. Bug: 16296405" into klp-modular-docs 
* commit 'edcf7c51676e3b4d0481dcdc9c2e128f7f4f2e5d':
  docs: Simplify and update the Signing page. Bug: 16296405
 2014-08-07 16:03:27 +00:00
Robert Ly
001e30729a am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '23daa44107c17d7e30c65389bb718a9add8e4c40':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:59:36 +00:00
Lajos Molnar
1374f25f6d am 422a30f4: am c7232229: am b18308b2: Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 
* commit '422a30f453b8b4f4fd024ef4f0879b3e7e1633ac':
  ImageReader: fix documentation, relax some guarantees
 2014-08-07 15:55:31 +00:00
Robert Ly
23daa44107 am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 
* commit '8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
 2014-08-07 15:55:10 +00:00