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

112757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maggie Benthall
b964e5edff am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 
* commit 'f5aba5ad1e09829a13bd0ad4912e45ff3d773176':
  CA cert monitoring: add notifications and actions for dialog
 2013-09-14 11:02:43 -07:00
Maggie Benthall
f5aba5ad1e Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 2013-09-14 18:00:13 +00:00
Michael Jurka
9d4d14fa29 am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 
* commit '276e6c7a89ed91dbf3e4fe9f46d19e82656d8fd9':
  Add new intent/method for cropping and setting wallpapers
 2013-09-14 05:29:39 -07:00
Michael Jurka
276e6c7a89 Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 2013-09-14 12:25:51 +00:00
Chet Haase
140f3dff59 am 750ce3ac: Merge "Only buildLayer() on attached views" into klp-dev 
* commit '750ce3acf23e5c2e5b239154a2539391544f9463':
  Only buildLayer() on attached views
 2013-09-13 20:42:25 -07:00
Chet Haase
750ce3acf2 Merge "Only buildLayer() on attached views" into klp-dev 2013-09-14 03:39:45 +00:00
Dirk Dougherty
391b3090f3 am c8db445e: am a99cc3a7: am 788fc628: am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs 
* commit 'c8db445e42f1b60b9af036cb0d793ee11ae4c9c6':
  Update documentation for speech APIs.
 2013-09-13 20:02:01 -07:00
Dirk Dougherty
c8db445e42 am a99cc3a7: am 788fc628: am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs 
* commit 'a99cc3a72d7ff883b8ade7e119169b561fc98e17':
  Update documentation for speech APIs.
 2013-09-13 19:59:29 -07:00
Dirk Dougherty
a99cc3a72d am 788fc628: am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs 
* commit '788fc6285a0b7f1585c5a4fa68599af7c07747e5':
  Update documentation for speech APIs.
 2013-09-13 19:56:03 -07:00
Dirk Dougherty
788fc6285a am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docs 
* commit '6212f6b3c5c92298fedbb37f5ceb0094b770549b':
  Update documentation for speech APIs.
 2013-09-13 19:53:26 -07:00
Dirk Dougherty
6212f6b3c5 Merge "Update documentation for speech APIs." into jb-mr2-docs 2013-09-14 02:50:16 +00:00
Scott Main
620d910bff am c8aeb95d: am 19612c63: am 575245dc: am 1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs 
* commit 'c8aeb95df1511a148bba8002089d40ea8163b792':
  update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
 2013-09-13 19:42:45 -07:00
Scott Main
c8aeb95df1 am 19612c63: am 575245dc: am 1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs 
* commit '19612c63519dce47b1cbe03d1691ec66f7160c44':
  update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
 2013-09-13 19:39:15 -07:00
Scott Main
19612c6351 am 575245dc: am 1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs 
* commit '575245dc29441fc796442805caa16000f48f27cc':
  update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
 2013-09-13 19:36:49 -07:00
Scott Main
575245dc29 am 1294a8f9: Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs 
* commit '1294a8f9a2ccc4e19d218dbe8645ddac533706d8':
  update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet.
 2013-09-13 19:33:17 -07:00
Scott Main
1294a8f9a2 Merge "update samples landing page with summaries based on parameter in the url. This is just for testing purposes... no real functionality yet." into jb-mr2-docs 2013-09-14 02:31:08 +00:00
Scott Main
808eb3ad33 update samples landing page with summaries based on parameter in the url. 
This is just for testing purposes... no real functionality yet.

Change-Id: I7d18033b01a7c3615e3d998da71062b25af22b28
 2013-09-13 19:29:54 -07:00
Geoff Mendal
6689c674d9 am c028d8f0: Merge "Disable ActionBar transitions" into klp-dev 
* commit 'c028d8f05c0cf32489bd369ce5612ce6a4077e7a':
  Disable ActionBar transitions
 2013-09-13 19:09:47 -07:00
Geoff Mendal
c028d8f05c Merge "Disable ActionBar transitions" into klp-dev 2013-09-14 02:08:20 +00:00
Chet Haase
5fd37236df Only buildLayer() on attached views 
A recent change to ViewPropertyAnimator.withLayer() builds the layer
immediately after creating it. This works in general, but if the view
is not attached, buildLayer() throws an exception.

The fix is to ensure that the view is attached before calling buildLayer().

Issue #10750925 Dialer crashed and phone dropped while on call

Change-Id: I801c835a0f5cb81e159fe90c157c122cf2d0da01
 2013-09-13 19:01:52 -07:00
Chet Haase
7d077d0364 Disable ActionBar transitions 
A problem with transitions is causing various ActionBar icons to go
missing occasionally. This CL disables these transitions for now
to allow ActionBar to work as expected.

Issue #10726905 ActionBar weirdness in People app

Change-Id: I0cb774840ae84cbb733d65865f8c1b4c6d7490fa
 2013-09-13 18:51:12 -07:00
Dianne Hackborn
38743f2a67 am e39ced0f: Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev 
* commit 'e39ced0f7cb236759b45eeaefddcd578e2cfcf8d':
  Maybe fix issue #10748810: Runtime restart: crash under...
 2013-09-13 18:45:39 -07:00
Dianne Hackborn
e39ced0f7c Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev 2013-09-14 01:43:20 +00:00
Dianne Hackborn
a0332377e1 Maybe fix issue #10748810: Runtime restart: crash under... 
...ActivityManagerService.setProcessTrackerState

And if not, at least we'll have a little more debug info
when it happens again.

Change-Id: I685f0f72c2e1b17608a8d069d6c7f2cff2fd0abd
 2013-09-13 18:34:13 -07:00
Scott Main
7e87648232 am 296fbce8: am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit '296fbce89c066099bbf4f3828cf8ed797acebdfb':
  more javadocs for onTrimMemory()
 2013-09-13 18:13:51 -07:00
Scott Main
296fbce89c am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit 'bb3b431dc6b5786bed7cc988f44c35df21408a93':
  more javadocs for onTrimMemory()
 2013-09-13 18:09:45 -07:00
Dianne Hackborn
570d0ca39c am fc9122ec: Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 
* commit 'fc9122ecae06339283602bdc78c5d704d95e3f29':
  Implement #10666712: NetworkOnMainThreadException should be...
 2013-09-13 18:06:59 -07:00
David Christie
691a3191e3 am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 
* commit '5f68f717019433ce4fa284386ba48bd1b571073a':
  Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
 2013-09-13 18:06:56 -07:00
Scott Main
bb3b431dc6 am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit '8bf0c9ae604e5114260159077bfafbdd9d16a7ea':
  more javadocs for onTrimMemory()
 2013-09-13 18:06:28 -07:00
Dianne Hackborn
fc9122ecae Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 2013-09-14 01:04:05 +00:00
Scott Main
8bf0c9ae60 am a23fd887: more javadocs for onTrimMemory() 
* commit 'a23fd88729bd10c02a9d631c9954616b3a1d0f6f':
  more javadocs for onTrimMemory()
 2013-09-13 18:03:18 -07:00
David Christie
5f68f71701 Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 2013-09-14 01:02:40 +00:00
Scott Main
a23fd88729 more javadocs for onTrimMemory() 
Change-Id: I52a99bc1b07732e474d1c632f3021c6c4db8c5ab
 2013-09-13 17:57:16 -07:00
David Christie
6ab2284c98 Strip names out of externally supplied WorkSources to WifiManager (b/10710007). 
Change-Id: I69bd7ce9e942c2f9327415b2821d805e1b50a1a4
 2013-09-13 17:34:40 -07:00
Dianne Hackborn
7e7144218e Implement #10666712: NetworkOnMainThreadException should be... 
...relayed back to calling application

What's one more exception between friends?

Change-Id: Ib83c7bfbddd397457dcdbe506a8cd2bc0f4fb70b
 2013-09-13 17:32:57 -07:00
Adam Powell
db34f3d17d am 50e5814c: Merge "Check RelativeLayout\'s access of its own LayoutParams during measurement" into klp-dev 
* commit '50e5814c337f67c74d9e249cf6f67ac86dfc832d':
  Check RelativeLayout's access of its own LayoutParams during measurement
 2013-09-13 17:26:27 -07:00
Dianne Hackborn
5b7359aa44 am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 
* commit '76adfd71f1ebdf50a03c85e2a7c87d5691f81b13':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo
 2013-09-13 17:26:24 -07:00
Adam Powell
50e5814c33 Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev 2013-09-14 00:23:07 +00:00
Jeff Tinker
3b3b2efb07 am fff175ae: Merge "Part of corrections from KLP API Review: Media" into klp-dev 
* commit 'fff175aedc86a176fb6ceafe00fe5a26adc5d909':
  Part of corrections from KLP API Review: Media
 2013-09-13 17:22:31 -07:00
Chris Craik
bb451bda4a am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev 
* commit '0d3c52d3afc1e3ea4ae2ea63355388a095ebeb4c':
  Fix merged operation clipping
 2013-09-13 17:22:27 -07:00
Christopher Tate
5de041193c am 0f8ec44b: Merge "Prune shared users that the system declares but does not use" into klp-dev 
* commit '0f8ec44b13487f5726cab77eb79cac016e090b25':
  Prune shared users that the system declares but does not use
 2013-09-13 17:22:24 -07:00
Dianne Hackborn
76adfd71f1 Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 2013-09-14 00:22:06 +00:00
Dianne Hackborn
3fa8969021 Fix issue #10461477: KLP API Review: Debug.MemoryInfo 
Oops.

Change-Id: I2143790af9e6649dba8d74618358c47232cf6cc4
 2013-09-13 17:20:00 -07:00
Jeff Tinker
fff175aedc Merge "Part of corrections from KLP API Review: Media" into klp-dev 2013-09-14 00:16:34 +00:00
Glenn Kasten
edc538a793 am 0f3e1487: Merge "Remove obsolete assets from target /system/media/video/" into klp-dev 
* commit '0f3e1487b26a822697f70747290809081c2072cc':
  Remove obsolete assets from target /system/media/video/
 2013-09-13 17:16:19 -07:00
Dianne Hackborn
0af9fb526b am 236afa0d: Merge "Fix issue #10747324: adb install hangs" into klp-dev 
* commit '236afa0d8b3e146c97801bd72a224b0908cd93f9':
  Fix issue #10747324: adb install hangs
 2013-09-13 17:16:13 -07:00
Adam Powell
3cfc5995bf am 3157e73f: Merge "Don\'t recycle action button views" into klp-dev 
* commit '3157e73fb0ea392b8dd2a6bbf6b74d8dfa54cc52':
  Don't recycle action button views
 2013-09-13 17:16:08 -07:00
Rachad Alao
00b3f942e4 am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 
* commit '4fe6429ba2c77a2cc639d712ba979e1f538c5bb1':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
 2013-09-13 17:16:05 -07:00
Jeff Sharkey
56cb98e8f1 am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev 
* commit '12c7a0c970dfa56391f1e7f7a8ed41348acb14c4':
  More UX updates around picking images.
 2013-09-13 17:16:01 -07:00
Craig Mautner
f6f36a95a2 am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit '540421ba984655b07f2b70bae1db9ae1bc3052aa':
  When launching home activity, make sure it is top.
 2013-09-13 17:15:58 -07:00