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

113732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
64cb8f158c am 620d910b: 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 '620d910bfff3977e40552fbb9d27c89ef7cb9914':
  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:45:44 -07: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
84443425e2 am 6689c674: am c028d8f0: Merge "Disable ActionBar transitions" into klp-dev 
* commit '6689c674d9eb7aa62596b362f87e2d06e10d44ef':
  Disable ActionBar transitions
 2013-09-13 19:11:52 -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
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
14520b79fa am 38743f2a: am e39ced0f: Merge "Maybe fix issue #10748810: Runtime restart: crash under..." into klp-dev 
* commit '38743f2a67259d8eab55c70cee7709ad7aac6e8f':
  Maybe fix issue #10748810: Runtime restart: crash under...
 2013-09-13 18:48:05 -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
Alan Viverette
d17e719da0 Merge "Clean up layout constructors, make them consistent" 2013-09-14 01:22:45 +00:00
Scott Main
26c5baf41d am 7e876482: am 296fbce8: am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory() 
* commit '7e87648232e955629375c6ae047b9c2faceaa67e':
  more javadocs for onTrimMemory()
 2013-09-13 18:17:10 -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
Dianne Hackborn
3f7867b603 am 570d0ca3: am fc9122ec: Merge "Implement #10666712: NetworkOnMainThreadException should be..." into klp-dev 
* commit '570d0ca39cd8d11faf7cc453cfd8096e07c3877b':
  Implement #10666712: NetworkOnMainThreadException should be...
 2013-09-13 18:10:19 -07:00
David Christie
6180e84410 am 691a3191: am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 
* commit '691a3191e3efb11f0607c45f29e460d2baf8188e':
  Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
 2013-09-13 18:10:16 -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
3934b9f520 am db34f3d1: am 50e5814c: Merge "Check RelativeLayout\'s access of its own LayoutParams during measurement" into klp-dev 
* commit 'db34f3d17d0d2b6eaad8369536dcbb1025d0a00c':
  Check RelativeLayout's access of its own LayoutParams during measurement
 2013-09-13 17:32:21 -07:00
Dianne Hackborn
e054986657 am 5b7359aa: am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 
* commit '5b7359aa442a120c2853a05bc987c501da659df2':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo
 2013-09-13 17:32:18 -07:00
Jeff Tinker
62642e1b8e am 3b3b2efb: am fff175ae: Merge "Part of corrections from KLP API Review: Media" into klp-dev 
* commit '3b3b2efb077b56f65a9c48c95f8dfab9af5ec531':
  Part of corrections from KLP API Review: Media
 2013-09-13 17:32:10 -07:00
Chris Craik
d3979bc5a7 am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev 
* commit 'bb451bda4a08f79b60f84242647bdb40962f01b5':
  Fix merged operation clipping
 2013-09-13 17:32:06 -07:00
Christopher Tate
c083cb719a am 5de04119: am 0f8ec44b: Merge "Prune shared users that the system declares but does not use" into klp-dev 
* commit '5de041193cec58e8ee40a62c760b24141455b2f8':
  Prune shared users that the system declares but does not use
 2013-09-13 17:32:02 -07:00
Glenn Kasten
c8b9ea3d02 am edc538a7: am 0f3e1487: Merge "Remove obsolete assets from target /system/media/video/" into klp-dev 
* commit 'edc538a7936925edb9767148dee39f3e78b9ef08':
  Remove obsolete assets from target /system/media/video/
 2013-09-13 17:30:57 -07:00
Dianne Hackborn
6cc372b16a am 0af9fb52: am 236afa0d: Merge "Fix issue #10747324: adb install hangs" into klp-dev 
* commit '0af9fb526b67ddb2d7f55dabef4379f46b622d57':
  Fix issue #10747324: adb install hangs
 2013-09-13 17:30:53 -07:00
Adam Powell
f206b5935e am 3cfc5995: am 3157e73f: Merge "Don\'t recycle action button views" into klp-dev 
* commit '3cfc5995bfa5d9d4c9203991131d76947c572b58':
  Don't recycle action button views
 2013-09-13 17:30:48 -07:00
Rachad Alao
1f54af0996 am 00b3f942: am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 
* commit '00b3f942e45f08b4f1e86a6c9c8cdaecf4efecc4':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
 2013-09-13 17:30:45 -07:00
Jeff Sharkey
be9e10a26d am 56cb98e8: am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev 
* commit '56cb98e8f122f202f76e9b9cc072a72b80ef6600':
  More UX updates around picking images.
 2013-09-13 17:30:41 -07:00
Craig Mautner
5bb9c2edb7 am f6f36a95: am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit 'f6f36a95a238381740a92263a76af790bc93ae37':
  When launching home activity, make sure it is top.
 2013-09-13 17:30:36 -07:00
Vineeta Srivastava
6a60c7bd4e am 2089abdf: am 45fa4219: Merge "Roaming Icon should not displayed with Indosat\'s old SIM" into klp-dev 
* commit '2089abdf787df5a179db6486f39441c57db82833':
  Roaming Icon should not displayed with Indosat's old SIM
 2013-09-13 17:30:33 -07:00
Dianne Hackborn
1cd9a73ac0 am f3b4cf7d: am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit 'f3b4cf7d01b68418dd652e201868d140de081bd8':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:30:31 -07:00
Zhihai Xu
078c1f3606 am a33ebcb9: am 78d47240: Merge "Fixed review comments" into klp-dev 
* commit 'a33ebcb9edd5d8a8148d9080d2bf48b76d2b93fb':
  Fixed review comments
 2013-09-13 17:30:27 -07:00
Victoria Lease
a98655f053 am fff3f7cc: am 22e2c225: Merge "NotoColorEmoji.ttf is the new AndroidEmoji.ttf" into klp-dev 
* commit 'fff3f7cc824ea92fd14e8e528baf06d1af620749':
  NotoColorEmoji.ttf is the new AndroidEmoji.ttf
 2013-09-13 17:30:24 -07:00
Baligh Uddin
4e87843a20 am 649bb2dc: (-s ours) am 62f3bdec: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '649bb2dc30f6b43806c52829f9329f8d35f1ecd5':
  Import translations. DO NOT MERGE
 2013-09-13 17:30:21 -07:00
Deepanshu Gupta
f392e5d4f6 am 68862f07: (-s ours) am 79a1a7c3: am 31207780: am 0ecfe381: am 54d88f76: Fix ClassCastException when rendering ListView 
* commit '68862f07b6b8421a2d0aeafe62e4285525e14166':
  Fix ClassCastException when rendering ListView
 2013-09-13 17:30:18 -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