Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,037 Commits 3 Branches 0 Tags
ab26cbed244d2d57ce4335647ec5b920d4d79367
Commit Graph

155037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
ab26cbed24 am a5e5a884: am 17eefabd: am 9dfad8c7: Merge "Remove misleading error log." into lmp-dev 
* commit 'a5e5a88464cd7e7bee55c11fb27da20052c50df2':
  Remove misleading error log.
 2014-10-02 20:29:32 +00:00
Craig Mautner
a5e5a88464 am 17eefabd: am 9dfad8c7: Merge "Remove misleading error log." into lmp-dev 
* commit '17eefabd4494b034d4342f0e239e24085d989109':
  Remove misleading error log.
 2014-10-02 20:23:45 +00:00
Craig Mautner
17eefabd44 am 9dfad8c7: Merge "Remove misleading error log." into lmp-dev 
* commit '9dfad8c7f01e8a69989d1c44deb8a621216a0d9f':
  Remove misleading error log.
 2014-10-02 20:18:05 +00:00
Craig Mautner
9dfad8c7f0 Merge "Remove misleading error log." into lmp-dev 2014-10-02 20:13:55 +00:00
Chris Craik
ab8f73a7f1 am 497cb6c0: Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev 
* commit '497cb6c0a9818c5ba27df3e5a50878144505405f':
  Avoid creating Caches instance with gfxinfo dump
 2014-10-02 20:08:21 +00:00
Chris Craik
9977d890e2 am 438fe593: Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 
* commit '438fe5937f3bc04087f48b511a799f9f6cf5a205':
  Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates
 2014-10-02 20:08:17 +00:00
Chris Craik
497cb6c0a9 Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev 2014-10-02 20:02:43 +00:00
Chris Craik
438fe5937f Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev 2014-10-02 20:02:31 +00:00
Chris Craik
00d96e7dd1 am 59e129fb: Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev 
* commit '59e129fbc8a70d58d124ccc309661719f562b486':
  Account for colorfilter transparency in determining paint opacity
 2014-10-02 19:33:13 +00:00
Chris Craik
59e129fbc8 Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev 2014-10-02 19:28:09 +00:00
Craig Mautner
333c2ec883 Remove misleading error log. 
It's perfectly ok for a secondary display to not have a home stack.
There is no reason to report it.

Related to b/17677973.

Change-Id: Ia9d52cabb601760d32d2b847dfa0ca4f304e4e2a
 2014-10-02 12:24:02 -07:00
Etan Cohen
6e5f114f52 am 6062a09d: Enable VoLTE on VZW 311/480 
* commit '6062a09dbc1c26cacb6fa2dac7467ae826b70229':
  Enable VoLTE on VZW 311/480
 2014-10-02 19:23:15 +00:00
Etan Cohen
6062a09dbc Enable VoLTE on VZW 311/480 
Change-Id: I81188c2a7dfe4657d35048f7b4e76fe01803f9a1
 2014-10-02 19:13:19 +00:00
Ricardo Cervera
91a565e98a am 0825c0a7: am 96762e59: am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '0825c0a70ad1200824e5c07c6d1d4d21c696b921':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:32:54 +00:00
Ricardo Cervera
0825c0a70a am 96762e59: am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '96762e59b77d08b7165d39ec8d5db4a1240334b8':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:28:41 +00:00
Ricardo Cervera
96762e59b7 am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '134b62ed14b830b467423082036b3222f84f291c':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:23:46 +00:00
Ricardo Cervera
134b62ed14 am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit 'e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:18:30 +00:00
Ricardo Cervera
e1e0e05a14 am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '957f45c328c9cbe9d1fb65dab6d342dc28a85954':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:13:55 +00:00
Rich Slogar
d493e5ddba am a3d739d8: am 6778b81f: am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'a3d739d874770ad47506c2a200490ca5a5a25de2':
  docs: Update for Android 23.0.4
 2014-10-02 18:13:31 +00:00
Rich Slogar
a3d739d874 am 6778b81f: am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit '6778b81fce54882635e8e6235a052bd3af569360':
  docs: Update for Android 23.0.4
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Rich Slogar
6778b81fce am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'da5febdcb24fd74feb1341a8b0deb92089388595':
  docs: Update for Android 23.0.4
 2014-10-02 18:03:19 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting. 
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
 2014-10-02 10:57:39 -07:00
Rich Slogar
da5febdcb2 am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit '74ce7413158607af6be2889d7392c2e904c9c210':
  docs: Update for Android 23.0.4
 2014-10-02 17:53:38 +00:00
Rich Slogar
74ce741315 am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'b15cd5296675fac00e5517b89fc1263d59fbad65':
  docs: Update for Android 23.0.4
 2014-10-02 17:44:43 +00:00
Michael Wright
d3d6660555 am 4d1bb519: Merge "Add supported refresh rates for all DisplayDeviceInfos." into lmp-mr1-dev 
* commit '4d1bb519db6f4b5441281ec1586325883305d840':
  Add supported refresh rates for all DisplayDeviceInfos.
 2014-10-02 17:43:26 +00:00
Ihab Awad
53f7a44ccb am 4cb7274d: Merge "Update api/current.txt" into lmp-mr1-dev 
* commit '4cb7274d167ba05c1981fc63e4b84c76df8926dc':
  Update api/current.txt
 2014-10-02 17:43:22 +00:00
Michael Wright
4d1bb519db Merge "Add supported refresh rates for all DisplayDeviceInfos." into lmp-mr1-dev 2014-10-02 17:40:25 +00:00
Ihab Awad
4cb7274d16 Merge "Update api/current.txt" into lmp-mr1-dev 2014-10-02 17:39:08 +00:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
 2014-10-02 17:38:35 +00:00
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4 
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
 2014-10-02 10:19:17 -07:00
Ihab Awad
463dcae219 Update api/current.txt 
Changes made in branch lmp-dev are @hide-den there but not here. When
they propagate downstream, we need to update api/current.txt.

Change-Id: Ic267f62391503d9acfb8451b16d5bb18035c948c
 2014-10-02 10:13:30 -07:00
Kenny Guy
88b01d88a2 am 27cee100: am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '27cee10057e7ab61c00c1fc5898bc630b39e8fa5':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 17:06:50 +00:00
Kenny Guy
27cee10057 am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit 'bdcfc01b3bff1ff1c4237dccfb90704326890bee':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 17:00:42 +00:00
Newton Allen
58f75627d1 am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit '94f5155d6c81b5fd3326a91e4a2670bccfddf284':
  Fix some documentation typos.
 2014-10-02 16:58:30 +00:00
Kenny Guy
bdcfc01b3b am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 16:55:35 +00:00
Newton Allen
94f5155d6c am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'c68aad9fd0f7937176ac6a8238e6236dd7ea3427':
  Fix some documentation typos.
 2014-10-02 16:52:50 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +00:00
Newton Allen
c68aad9fd0 am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:47:19 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
Paul West
98bb023a89 am c55a2547: am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit 'c55a2547a1462a1bf9e1b3c4e102d4d61877d7fe':
  [DS] DSDS support for widget view
 2014-10-02 15:34:09 +00:00
Paul West
c55a2547a1 am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 
* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
  [DS] DSDS support for widget view
 2014-10-02 15:28:41 +00:00
Paul West
bebcde4453 Merge "[DS] DSDS support for widget view" into lmp-sprout-dev 2014-10-02 15:24:14 +00:00
smain@google.com
aaf38de492 am 629e2f54: am 94f04cbe: am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '629e2f54832540133227a5bb5ce999fef0d7b0be':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:16:41 +00:00
smain@google.com
629e2f5483 am 94f04cbe: am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '94f04cbe4bf5e531a74cc1cdc5b080110f47f5a5':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:10:29 +00:00
smain@google.com
94f04cbe4b am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '74c2ec3644101ce4cc96e11a851daf21bf35e174':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:06:06 +00:00
smain@google.com
74c2ec3644 Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 2014-10-02 15:02:17 +00:00
George Mount
7aaefa52e0 am b29b651d: am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'b29b651dd58cf55303ea86e444e62ada540eaf6d':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:45:33 +00:00