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

104268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iliyan Malchev
66acbc221b am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev 
* commit '0dff78aa32d8e7bc2eb057f2878a9e010417e42a':
  Revert "wifi: Get full scan results"
 2013-06-18 18:18:21 -07:00
Iliyan Malchev
0dff78aa32 Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev 2013-06-19 01:16:23 +00:00
Vineeta Srivastava
c2cbd4c11b Revert "wifi: Get full scan results" 
This reverts commit 67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.

Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713

Conflicts:
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
 2013-06-18 16:56:02 -07:00
Scott Main
c485361e9c am 99700bfe: update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c 
* commit '99700bfee02dd99e47bca5f0ab4e841239deda04':
  update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
 2013-06-18 15:25:06 -07:00
Scott Main
99700bfee0 update supported media formats. 
as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c

Change-Id: If35f4bb35b8aabacb51dec79a00a0c353b8a5d3c
 2013-06-18 10:49:06 -07:00
Scott Main
94ba190ebb am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev 
* commit 'de04dfb62dd43827c63c267003264966dd76c614':
  some extra docs for TextDirectionHeuristic
 2013-06-17 22:12:14 -07:00
Scott Main
de04dfb62d Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev 2013-06-18 05:10:32 +00:00
Scott Main
c8b4658a54 am 1a0a50e7: add collapsed list items for 4.1 TOC 
* commit '1a0a50e7c23fb0ec5fe818a7069b890f22632691':
  add collapsed list items for 4.1 TOC
 2013-06-17 19:23:02 -07:00
Scott Main
1a0a50e7c2 add collapsed list items for 4.1 TOC 
Change-Id: I241fb5415a3b893df7c8491c7a549f3d0d304e74
 2013-06-17 19:19:38 -07:00
Scott Main
e442662330 some extra docs for TextDirectionHeuristic 
Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3
 2013-06-17 19:05:29 -07:00
Scott Main
c4473d10ed am 27a8508e: add attributes reference for splimotionevents and layoutmode 
* commit '27a8508ee1236ded652cd452b93884a9193654fc':
  add attributes reference for splimotionevents and layoutmode
 2013-06-17 18:36:09 -07:00
Scott Main
27a8508ee1 add attributes reference for splimotionevents and layoutmode 
Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8
 2013-06-18 01:33:33 +00:00
Scott Main
e4f975a321 am 7328de3d: am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '7328de3d02b8784b7562e1e0d2e749fdb854a095':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:59:29 -07:00
Scott Main
7328de3d02 am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '23f33bdab3da7ac3eb11d483eb038024ed4e3564':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:56:54 -07:00
Scott Main
23f33bdab3 am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '6b55515ed3c1e97b0dd932a482c375d0103f84cc':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:54:26 -07:00
Scott Main
6b55515ed3 am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '41b08da8198e76118ef7167058a88cb920f9fb74':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:53:06 -07:00
Xia Wang
8fcb169f79 am edc3bb66: Disable a flaky test case 
* commit 'edc3bb661e9c8964d3926cbd7344793a32a2c2cd':
  Disable a flaky test case
 2013-06-17 17:48:47 -07:00
Scott Main
41b08da819 replace 'developers strick back' with 'this week in android' playlist 
Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c
 2013-06-17 17:47:36 -07:00
Xia Wang
edc3bb661e Disable a flaky test case 
Change-Id: I4ef780ed0c5394b67aa002baefc00e835018c4a0
 2013-06-17 17:14:10 -07:00
Baligh Uddin
9e7926f28a am 4a9e4226: (-s ours) Import translations. DO NOT MERGE 
* commit '4a9e422680727cd1a8fd683bae98c62baa0710fd':
  Import translations. DO NOT MERGE
 2013-06-15 19:19:07 -07:00
Baligh Uddin
2f9807b8d7 Import translations. DO NOT MERGE 
Change-Id: Ia0e22026f6b361ea67d393e154d719a46759ecea
Auto-generated-cl: translation import
 2013-06-14 19:28:47 -07:00
Baligh Uddin
4a9e422680 Import translations. DO NOT MERGE 
Change-Id: I45fbf411dc3f8cdb9a5ebd889ccf3a2868abb5a9
Auto-generated-cl: translation import
 2013-06-14 19:27:44 -07:00
Scott Main
07d6d9e74c Merge "additional documentation for media codec info" into jb-mr2-dev 2013-06-15 00:04:50 +00:00
Daniel Sandler
a0c9b9d2a7 Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev 2013-06-14 20:29:24 +00:00
Scott Main
c06bb7f5b9 additional documentation for media codec info 
Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad
 2013-06-14 11:56:15 -07:00
Scott Main
3b0205b760 am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit '0b3fe0785c0c6ff0ce834c06b6828f884a658730':
  fix transition from download to install instructions
 2013-06-14 11:02:41 -07:00
Scott Main
0b3fe0785c am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit 'a17201a81691ac337426923d1bdcf9e0a26b841e':
  fix transition from download to install instructions
 2013-06-14 10:56:28 -07:00
Scott Main
a17201a816 am 7190a059: fix transition from download to install instructions 
* commit '7190a05951efa4f5cf94bb22da48dce85c52bd06':
  fix transition from download to install instructions
 2013-06-14 10:53:45 -07:00
Scott Main
7190a05951 fix transition from download to install instructions 
Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9
 2013-06-14 10:51:29 -07:00
Scott Main
6e5942894a am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:16:02 -07:00
Scott Main
d2ad6dc530 am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit '6af13a74d3dcf56187edf153e0341221faf9f1ad':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:12:30 -07:00
Scott Main
6af13a74d3 am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'ec025db4a74914640c42412c63413f2d5d46e45d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:09:12 -07:00
Dirk Dougherty
f1d2c5aeb2 Merge "Doc change: diffs for API 18" into jb-mr2-dev 2013-06-14 16:23:12 +00:00
Scott Main
92053f8b28 revise docs for new sensor types. fix markup error causing tons of code font 
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
 2013-06-13 16:37:51 -07:00
Dirk Dougherty
4c43ec639b Doc change: diffs for API 18 
Change-Id: I92d9880959e18bb0cffa68a05a042de6d5790aa4
 2013-06-13 16:33:04 -07:00
Scott Main
ec025db4a7 change studio version number to use 'x' for final decimal. 
also go to install guide after download begins

Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc
 2013-06-13 15:00:43 -07:00
Scott Main
f52532de2a am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit 'cb2a85058e24ecd35349b5470e402bcb52df2d6b':
  add ninepatch search tag
 2013-06-13 14:54:48 -07:00
Scott Main
cb2a85058e am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '695896a46578e7ad4e540151e799a9f0b8828ad1':
  add ninepatch search tag
 2013-06-13 14:51:47 -07:00
Scott Main
695896a465 am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '46c8931ffc78f5204b34f7ba5098defbc318b7a4':
  add ninepatch search tag
 2013-06-13 14:49:20 -07:00
Scott Main
46c8931ffc Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 2013-06-13 21:47:27 +00:00
Dave Burke
34bc73dff1 Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 2013-06-13 04:08:42 +00:00
kmccormick
4b5a6255e0 am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'e9abc5e935deab1c63f89971380b9f9a9eed1af9':
  Doc update: restoring deprecation messages
 2013-06-12 19:35:56 -07:00
kmccormick
e9abc5e935 am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'b89c6ac4e65c0aaadddd65d1f816860681615b1e':
  Doc update: restoring deprecation messages
 2013-06-12 19:33:50 -07:00
kmccormick
b89c6ac4e6 am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '9af7d4072849de24a0ac6401247c18c6ef915e2f':
  Doc update: restoring deprecation messages
 2013-06-12 19:31:12 -07:00
kmccormick
9af7d40728 am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '227615eeb7b6008e18d2b205cadccf4943a82e94':
  Doc update: restoring deprecation messages
 2013-06-12 19:28:58 -07:00
kmccormick
227615eeb7 am bf370185: Doc update: restoring deprecation messages 
* commit 'bf3701854841f97f52cd29b601431861598f5277':
  Doc update: restoring deprecation messages
 2013-06-12 19:26:57 -07:00
kmccormick
bf37018548 Doc update: restoring deprecation messages 
Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef
 2013-06-12 19:15:58 -07:00
Dirk Dougherty
fa42499bd5 am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit '14ef5964255730a838301d3eb7ab38a2eb745ba6':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:41:25 -07:00
Dirk Dougherty
14ef596425 am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit '5161fdf3039c4e31e498c259ca4bffae18d99331':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:39:11 -07:00
Dirk Dougherty
5161fdf303 am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'e5bde8e03574a17fea7c078ee00fb882eb3ec829':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:36:31 -07:00