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

82780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
be5ac14600 Merge "Doc update: C2DM -> GCM." 2012-08-01 13:22:37 -07:00
Peter Ng
2b1584c1d5 new confirming page and updates to progress and iconography 
Change-Id: I060ac3c34cf268d77b46ac235a2726202a4bb222
 2012-08-01 13:16:02 -07:00
Ying Wang
a854bd28df Import translations. DO NOT MERGE 
Change-Id: I4036c81a0a932e366969e9e333bbe3c5d46a9cd8
Auto-generated-cl: translation import
 2012-08-01 13:08:43 -07:00
Ying Wang
d8e7a0fa54 Import translations. DO NOT MERGE 
Change-Id: I0cd6bb14922544cff686ffd46ee3e82ccb894caa
Auto-generated-cl: translation import
 2012-08-01 13:08:14 -07:00
Chris Wren
790474ba3a am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev 
* commit 'f11e0e7176489f5213acaa7e36c677882854cb8d':
  Add missing docs to notification style rebuilder functions.
 2012-08-01 13:04:02 -07:00
Irfan Sheriff
ff9091912b Merge "Update statemachine for bssid change in supplicant" into jb-mr1-dev 2012-08-01 13:01:54 -07:00
Chris Wren
f11e0e7176 Merge "Add missing docs to notification style rebuilder functions." into jb-dev 2012-08-01 13:01:33 -07:00
Ying Wang
04c03ea503 Import translations. DO NOT MERGE 
Change-Id: Ie14d316803d26abfa7fb8b4e5958a7415d27b680
Auto-generated-cl: translation import
 2012-08-01 12:58:36 -07:00
Scott Main
c82875e4c1 am e2594672: Merge "dashboard update for 8/1" into jb-dev 
* commit 'e2594672d279234459aba308c093f444b04c5e91':
  dashboard update for 8/1
 2012-08-01 12:54:29 -07:00
Ying Wang
0bd4ca2f31 Import translations. DO NOT MERGE 
Change-Id: I9800c2ea2bfd95bb615962f7b8e94dfc47a847ff
Auto-generated-cl: translation import
 2012-08-01 12:50:06 -07:00
Scott Main
e2594672d2 Merge "dashboard update for 8/1" into jb-dev 2012-08-01 12:46:40 -07:00
Irfan Sheriff
67718ac036 Update statemachine for bssid change in supplicant 
We now use bssid instead of pending_bssid which was only valid in ASSOCIATING state.
This allows us to correctly update bssid during roaming.

Change-Id: Idffff329828196ecbfc5015882d3665c932cf1e6
 2012-08-01 12:19:40 -07:00
Robert Greenwalt
6b6ce6bfce am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 
* commit 'a5637bac23611a985696c92b49f93964f435ecb5':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
 2012-08-01 12:14:33 -07:00
Chris Wren
0bd664dab4 Add missing docs to notification style rebuilder functions. 
Bug: 6914726
Change-Id: I13efae036610523ec6f83696d3337054e79856aa
 2012-08-01 15:06:56 -04:00
Scott Main
45c159e31f dashboard update for 8/1 
Change-Id: I87e037c8128b4108ef94e18e7267304eb22083b9
 2012-08-01 11:20:38 -07:00
Robert Greenwalt
a5637bac23 Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 2012-08-01 11:01:21 -07:00
Dianne Hackborn
908aecc3a6 Start moving away from DisplayMetrics.DENSITY_DEVICE. 
This puts in most of the infrastructure needed to allow us to
switch between different densities at run time.  The main remaining
uses of the global are to initialize the Bitmap object (not sure
what to do about that since it doesn't have anything passed in
the constructor to get this information from), and being able to
load drawables if we need a different density than what was preloaded
by zygote.

Change-Id: Ifdbfd6b7a5c59e6aa22e63b95b78d96af3d96848
 2012-08-01 10:54:39 -07:00
James Dong
5267f52a06 am a7611551: am b1980049: Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev 
* commit 'a76115512ba566ed426b05e3c10842ae8c07a1d0':
  Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class
 2012-08-01 10:46:29 -07:00
James Dong
a76115512b am b1980049: Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev 
* commit 'b1980049855fd6c53e109b44ff012a053f9436f7':
  Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class
 2012-08-01 10:37:36 -07:00
James Dong
b198004985 Merge "Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class" into jb-mr1-dev 2012-08-01 10:33:28 -07:00
Roman Nurik
7da438a349 am 27833815: am 49771c3b: am 1d17f5a9: am da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 
* commit '27833815e7fc47832fafd4395644c42b794ab43c':
  docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
 2012-08-01 10:29:10 -07:00
Scott Main
92e218837e am e0986d3a: am b8babd68: am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev 
* commit 'e0986d3a2981e4bd81aca0bcec4c6a4dbbbeb190':
  fix more broken links
 2012-08-01 10:29:06 -07:00
Craig Mautner
893eacc591 am 4186f85d: am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev 
* commit '4186f85ddecc9d95aa130eb10bedbd2ef457c5b0':
  Remove debugging for b6829431.
 2012-08-01 10:29:01 -07:00
Roman Nurik
27833815e7 am 49771c3b: am 1d17f5a9: am da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 
* commit '49771c3beabaa13eb49c3c4288061ed29ab1d31c':
  docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
 2012-08-01 10:21:37 -07:00
Scott Main
e0986d3a29 am b8babd68: am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev 
* commit 'b8babd6837af40997f7df861d05e195f83dd2cfc':
  fix more broken links
 2012-08-01 10:21:34 -07:00
Craig Mautner
4186f85dde am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev 
* commit '28e000ef72e9f86dec9d7be82dfac6d8c05882f7':
  Remove debugging for b6829431.
 2012-08-01 10:21:28 -07:00
Roman Nurik
49771c3bea am 1d17f5a9: am da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 
* commit '1d17f5a917a1abd5dd6eb100e5f791cacc65d524':
  docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
 2012-08-01 10:06:49 -07:00
Scott Main
b8babd6837 am bca68970: am 0d9d5831: Merge "fix more broken links" into jb-dev 
* commit 'bca689703da6f64bfee05dd204149d0f40762344':
  fix more broken links
 2012-08-01 10:06:29 -07:00
Craig Mautner
28e000ef72 Merge "Remove debugging for b6829431." into jb-mr1-dev 2012-08-01 10:04:38 -07:00
Roman Nurik
1d17f5a917 am da5cb90b: Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 
* commit 'da5cb90b992a28c0affe0d52b3b53c1a7b839eb2':
  docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
 2012-08-01 10:02:41 -07:00
Scott Main
bca689703d am 0d9d5831: Merge "fix more broken links" into jb-dev 
* commit '0d9d583103aca82b6bc0be719b3579ee83760209':
  fix more broken links
 2012-08-01 10:02:24 -07:00
Craig Mautner
1c43719c47 Remove debugging for b6829431. 
Change-Id: If7da858722d5d0a5e7db2bc249d454bdee1ec94e
 2012-08-01 10:01:16 -07:00
Roman Nurik
da5cb90b99 Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev 2012-08-01 09:59:54 -07:00
Scott Main
0d9d583103 Merge "fix more broken links" into jb-dev 2012-08-01 09:58:53 -07:00
Peter Ng
0351b54e90 am c72a4957: am 5a912ac8: am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev 
* commit 'c72a495704235cbe130adfa1112297ce2ac2e009':
  moving accessibility image to callouts
 2012-08-01 09:07:34 -07:00
Peter Ng
ddda53ebc8 am 2c2291a0: am 5e07b6bd: am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev 
* commit '2c2291a046b4513410c7a6862e8676ff4f973c2a':
  new extras section linking to design talks
 2012-08-01 09:07:28 -07:00
Roman Nurik
37eecc7e92 docs: Add Device Art Generator for Nexus devices to d.a.c/distribute. 
Most of this code is adapted from my code.google.com/p/android-ui-utils
project.

Change-Id: If6763bc7a490e53bd31d5a713158577fa74cfd7b
 2012-08-01 09:05:37 -07:00
Peter Ng
c72a495704 am 5a912ac8: am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev 
* commit '5a912ac8b9a7c289519572234a33129c584716a0':
  moving accessibility image to callouts
 2012-08-01 09:03:29 -07:00
Peter Ng
2c2291a046 am 5e07b6bd: am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev 
* commit '5e07b6bd2658fb993c32bdbb4a97384fe021a7a3':
  new extras section linking to design talks
 2012-08-01 09:03:20 -07:00
Peter Ng
5a912ac8b9 am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev 
* commit '31737eaa39bd0ef21a3cdc5470bbf124c70a6948':
  moving accessibility image to callouts
 2012-08-01 08:59:37 -07:00
Peter Ng
5e07b6bd26 am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev 
* commit 'edd7873c3475b871b6496e854e369c8f15c7e9a1':
  new extras section linking to design talks
 2012-08-01 08:59:33 -07:00
Peter Ng
31737eaa39 am a8666422: Merge "moving accessibility image to callouts" into jb-dev 
* commit 'a86664223612ba8bfaded5a2ae2178b6482d9fd5':
  moving accessibility image to callouts
 2012-08-01 08:51:53 -07:00
Peter Ng
edd7873c34 am c2eb7080: Merge "new extras section linking to design talks" into jb-dev 
* commit 'c2eb7080481096777660aa726d46c2ccf21aca0d':
  new extras section linking to design talks
 2012-08-01 08:51:42 -07:00
The Android Automerger
a19d1ea36e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-01 07:10:35 -07:00
Raph Levien
07cc2a4e30 am 38dcf95a: am 1ae49ab8: Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev 
* commit '38dcf95ad5c08e4578709c619f357634862225f2':
  Fix bug 6892600 Font (character pairs) rendering issue
 2012-07-31 19:34:51 -07:00
Raph Levien
38dcf95ad5 am 1ae49ab8: Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev 
* commit '1ae49ab8655baeb0ddf1944d0a66cd598122408a':
  Fix bug 6892600 Font (character pairs) rendering issue
 2012-07-31 19:29:24 -07:00
Raph Levien
1ae49ab865 Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev 2012-07-31 19:26:55 -07:00
Romain Guy
cc4d056993 am 5d89b70a: am 413ab3a5: Merge "Improve gradients" into jb-mr1-dev 
* commit '5d89b70a5df86526f5eb6bec7ece20d2dc90ac90':
  Improve gradients
 2012-07-31 19:00:58 -07:00
Romain Guy
5d89b70a5d am 413ab3a5: Merge "Improve gradients" into jb-mr1-dev 
* commit '413ab3a5a2065295080ae063a72a9a7e30f2d484':
  Improve gradients
 2012-07-31 18:58:18 -07:00
Romain Guy
413ab3a5a2 Merge "Improve gradients" into jb-mr1-dev 2012-07-31 18:55:44 -07:00