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

151785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
15741d0e0b Merge "Add missing attr for KEYCODE_VOICE_ASSIST" into lmp-dev 2014-08-26 19:42:40 +00:00
Adam Lesinski
9d9607527f Split up ComponentName in UsageEvents.Event 
Some events in the future may not have originated
from a class, so we shouldn't be using ComponentName.

Bug:17259858
Change-Id: Id7fe3245b91596cf27ae4ec51655602f01665622
 2014-08-26 12:41:31 -07:00
Adam Lesinski
27046c88bf Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev 2014-08-26 19:38:04 +00:00
Ji-Hwan Lee
92740373f7 am 24e0e863: am 593d3117: Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 
* commit '24e0e8630154e217876a5c37bb2c0c65164b65a7':
  TIF: Reset main TvView only for explicit reset() call
 2014-08-26 19:33:05 +00:00
Calin Juravle
a4ed6aeee4 am ad7a10cd: am 0bc3cd87: Merge "Make native bridge property read-only." into lmp-dev 
* commit 'ad7a10cd74a36ee3e7b1a143f659a6ebb0517b7f':
  Make native bridge property read-only.
 2014-08-26 19:33:01 +00:00
Calin Juravle
ca989888e2 am e956c7f0: am 2fb4f93e: Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 
* commit 'e956c7f02cd51b577f46105620bb003059a2a87f':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-26 19:32:57 +00:00
Selim Gurun
8290294af9 am 690378d1: am 961aaadf: Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 
* commit '690378d1499052391b78d55c83a71c26c5d93062':
  Remove synchronized from acceptThirdPartyCookies()
 2014-08-26 19:32:52 +00:00
Ji-Hwan Lee
ef55d9335d am 593d3117: Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 
* commit '593d311772c63c38a07553f936865d3ad154380e':
  TIF: Reset main TvView only for explicit reset() call
 2014-08-26 19:27:34 +00:00
Calin Juravle
8f020c791c am 0bc3cd87: Merge "Make native bridge property read-only." into lmp-dev 
* commit '0bc3cd8709d45858c0f21beff45a69fb89f3f4af':
  Make native bridge property read-only.
 2014-08-26 19:27:29 +00:00
Calin Juravle
e9cc91085d am 2fb4f93e: Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 
* commit '2fb4f93efa5a7365def2dc9b19e68dbe04ed28d1':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-26 19:21:28 +00:00
Selim Gurun
389e887027 am 961aaadf: Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 
* commit '961aaadf532c81ee95a5e21a8e905cc91965eff9':
  Remove synchronized from acceptThirdPartyCookies()
 2014-08-26 19:21:18 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Calin Juravle
4db289eb54 Merge "Make native bridge property read-only." into lmp-dev 2014-08-26 19:18:24 +00:00
Amith Yamasani
5b1b6e217e am 619f2063: am a245f91c: Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 
* commit '619f20634b5e5578700ffdef98510fcc335dda71':
  Fix SetupWizard crash when creating Guest or Restricted profile
 2014-08-26 19:14:43 +00:00
Svetoslav
366d513bc6 am aae7838d: am 0fbd3928: Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 
* commit 'aae7838d105f3d67ef61a681f5cff1c2e3621f69':
  Fix accessiblity CTS tests (framework).
 2014-08-26 19:14:38 +00:00
Jorim Jaggi
3f4f5052a8 am 6b23a31c: am 4d323406: Merge "Update IME switcher icon" into lmp-dev 
* commit '6b23a31c1d3e9fd9e9d2d514cc2489b21a0926dd':
  Update IME switcher icon
 2014-08-26 19:14:24 +00:00
Amith Yamasani
200f20bed5 am a245f91c: Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 
* commit 'a245f91caed3dc2c073f152f0e371d8b27c43184':
  Fix SetupWizard crash when creating Guest or Restricted profile
 2014-08-26 19:11:34 +00:00
Svetoslav
2c9def2a0a am 0fbd3928: Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 
* commit '0fbd392870485d848bf69ef4431f882d63ead728':
  Fix accessiblity CTS tests (framework).
 2014-08-26 19:11:29 +00:00
Calin Juravle
d68f83cc47 Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 2014-08-26 19:10:25 +00:00
Selim Gurun
790f6f449d Merge "Remove synchronized from acceptThirdPartyCookies()" into lmp-dev 2014-08-26 19:09:48 +00:00
Calin Juravle
685a12b446 Make native bridge property read-only. 
Bug: 17104449

(cherry picked from commit 53db6ae7819177abb9df156b269726a69a8c72df)

Change-Id: I926356f1e472a20d571e40c0c7dbb9c5a66a44a9
 2014-08-26 20:07:51 +01:00
Jorim Jaggi
3fa0064ba4 am 4d323406: Merge "Update IME switcher icon" into lmp-dev 
* commit '4d3234069a794e2d7c63510f0b74b477aa51c24d':
  Update IME switcher icon
 2014-08-26 19:05:55 +00:00
Diego Pontoriero
8293adbe17 am 363f8fd0: am 1b3c0f25: Merge "Remove unused constant from TelephonyIntents." into lmp-dev 
* commit '363f8fd0188b76018b9cedaa8626082d07c5e48d':
  Remove unused constant from TelephonyIntents.
 2014-08-26 19:04:40 +00:00
Amith Yamasani
1771d39ebf Merge "Fix SetupWizard crash when creating Guest or Restricted profile" into lmp-dev 2014-08-26 19:02:18 +00:00
Svetoslav
e39baa7307 Merge "Fix accessiblity CTS tests (framework)." into lmp-dev 2014-08-26 19:01:50 +00:00
Baligh Uddin
2d1d387d3f Import translations. DO NOT MERGE 
Change-Id: Iac6630d0b618bc97f0bb62047cee97a797c52df7
Auto-generated-cl: translation import
 2014-08-26 11:57:30 -07:00
Adam Lesinski
4e9c07c0de Add indexOf method to ArrayMap & ArraySet 
Getting the indexOf is useful for doing compound operations
like:

int i = set.indexOf(key);
if (i >= 0) {
    Object o = set.valueAt(i);
    o.blah();
    set.removeAt(i);
}

Change-Id: I3d4b77d1461ba969fc6b4d332d52d4d084b5b53c
 2014-08-26 11:53:32 -07:00
Jorim Jaggi
6183cc1a68 Merge "Update IME switcher icon" into lmp-dev 2014-08-26 18:51:08 +00:00
Diego Pontoriero
a2f95d814d am 1b3c0f25: Merge "Remove unused constant from TelephonyIntents." into lmp-dev 
* commit '1b3c0f25bef103e9b5cefccb49e3b1a121fdedc6':
  Remove unused constant from TelephonyIntents.
 2014-08-26 18:47:10 +00:00
Jorim Jaggi
31fc3e8047 Update IME switcher icon 
Also make the transparency consistent with the other icons.

Bug: 15597889
Change-Id: Ia5c8ea0bed192b57c552c62358b365d979c4b062
 2014-08-26 20:42:38 +02:00
Adam Lesinski
448c076d33 am 806d4cfb: am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev 
* commit '806d4cfb2a06a01be4a58ff25a55797d9140b917':
  Have R classes generate their own reference rewrite logic
 2014-08-26 18:42:24 +00:00
Winson Chung
c46977c508 am 77b91f7d: am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev 
* commit '77b91f7d87a9994348364a912d3127be2595d5ed':
  Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
 2014-08-26 18:42:19 +00:00
Diego Pontoriero
c9256d3da1 Merge "Remove unused constant from TelephonyIntents." into lmp-dev 2014-08-26 18:36:41 +00:00
Jorim Jaggi
933df210e2 am 3181d2ab: am ac87c0b3: Merge "Fix jumping animation when using two-finger expand" into lmp-dev 
* commit '3181d2abbd3f39d2d9d2f881716b6dd0d8465d09':
  Fix jumping animation when using two-finger expand
 2014-08-26 18:31:41 +00:00
ztenghui
a0b6f1c236 am acd21c96: am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev 
* commit 'acd21c96a5c7734d3fd949b0ccbba3b910e48d95':
  Correctly detect the wrong Z value for the light
 2014-08-26 18:31:37 +00:00
ztenghui
7e313bb933 am 624b50cf: am 07856605: Merge "VD: Update the fillColor default as transparent" into lmp-dev 
* commit '624b50cf4da5a5c33dded850dc4756576e8c1084':
  VD: Update the fillColor default as transparent
 2014-08-26 18:31:26 +00:00
Georgi Nikolov
97f3d7e093 am 6f7beb16: am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev 
* commit '6f7beb160567d261f3b4da285d2f5bbfd2b43919':
  Add maximum time-out to sync operation
 2014-08-26 18:31:22 +00:00
Georgi Nikolov
be8dad1c63 am ee461b92: am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev 
* commit 'ee461b92a20137c05bc7065a71d188b2e80b69df':
  Don't back-off ALREADY_IN_PROGRESS syncs
 2014-08-26 18:31:17 +00:00
Adam Lesinski
4526cdec74 am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev 
* commit '521edf850799fd484ef2c363aed23ac8729240be':
  Have R classes generate their own reference rewrite logic
 2014-08-26 18:29:46 +00:00
Winson Chung
6a327bedfc am 319b4b57: Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev 
* commit '319b4b571c71a6943ff3a63154c873511ae01d87':
  Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)
 2014-08-26 18:29:41 +00:00
Jorim Jaggi
2cb0ebf7f7 am ac87c0b3: Merge "Fix jumping animation when using two-finger expand" into lmp-dev 
* commit 'ac87c0b3236517bacc244fc270dc0da92f3487b8':
  Fix jumping animation when using two-finger expand
 2014-08-26 18:24:59 +00:00
ztenghui
a44a0aa9ae am fadaa2cb: Merge "Correctly detect the wrong Z value for the light" into lmp-dev 
* commit 'fadaa2cb5e82046eb3c5a1b3458108f12e6cc376':
  Correctly detect the wrong Z value for the light
 2014-08-26 18:24:48 +00:00
ztenghui
eaa532425c am 07856605: Merge "VD: Update the fillColor default as transparent" into lmp-dev 
* commit '07856605a8001697ff50371b39ecd0cd4480fd57':
  VD: Update the fillColor default as transparent
 2014-08-26 18:24:43 +00:00
Adam Lesinski
3aa6076083 Merge "Have R classes generate their own reference rewrite logic" into lmp-dev 2014-08-26 18:23:57 +00:00
Winson Chung
5c1b42e4f5 Merge "Multiple performance changes to speed recents invocation/app launching time. (Bug 16987565)" into lmp-dev 2014-08-26 18:23:10 +00:00
Jorim Jaggi
b0768f6ad0 Merge "Fix jumping animation when using two-finger expand" into lmp-dev 2014-08-26 18:21:31 +00:00
Georgi Nikolov
cc6a91e0c7 am 172d3b87: Merge "Add maximum time-out to sync operation" into lmp-dev 
* commit '172d3b876310b20bc5b627a344ea51148dc39c7b':
  Add maximum time-out to sync operation
 2014-08-26 18:19:05 +00:00
Georgi Nikolov
015dcf6573 am 67a86862: Merge "Don\'t back-off ALREADY_IN_PROGRESS syncs" into lmp-dev 
* commit '67a8686203779cdfb158a41fda28290dd6134154':
  Don't back-off ALREADY_IN_PROGRESS syncs
 2014-08-26 18:18:58 +00:00
ztenghui
bed17d21b0 Merge "Correctly detect the wrong Z value for the light" into lmp-dev 2014-08-26 18:18:31 +00:00
ztenghui
ae82e604fa Merge "VD: Update the fillColor default as transparent" into lmp-dev 2014-08-26 18:18:16 +00:00