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

80608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
8982939d17 docs: Accessibility DevGuide, Jelly Bean edition 2012-09-17 10:50:42 -07:00
Scott Main
d46023d208 dashboard update for 9/4 
switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-17 10:50:03 -07:00
Katie McCormick
243170f759 Doc update: Fix typo. 2012-09-17 10:48:39 -07:00
Elliott Hughes
086676a4a6 am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit 'f5437ee86a34751fa6d441b95282feb315e19eb6':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-14 16:36:33 -07:00
Elliott Hughes
f5437ee86a am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-14 16:34:41 -07:00
Elliott Hughes
297ad25746 Merge "Deprecate those parts of DateUtils the documentation says not to use." 2012-09-14 16:12:36 -07:00
Elliott Hughes
d3c01012d8 Deprecate those parts of DateUtils the documentation says not to use. 
Applications using these fields and methods are just asking for i18n bugs.

Also @deprecate two int[]s that were never meant to be public.

Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
 2012-09-14 16:06:50 -07:00
Scott Main
9ae018462a fix broken link for action bar pack 
Change-Id: I58e774ef2b96bacd3678bd2354a584d58dd018ee
 2012-09-14 15:21:06 -07:00
Raph Levien
e590568417 am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable" 
* commit 'eceb317116d87dada85d06df8fe0e07dd4aec49d':
  framework: fix bug for uninitialized variable
 2012-09-14 12:16:32 -07:00
Raph Levien
eceb317116 am f4afc401: Merge "framework: fix bug for uninitialized variable" 
* commit 'f4afc40101c00800c4dc53f165b93f741327416d':
  framework: fix bug for uninitialized variable
 2012-09-14 12:15:03 -07:00
Raph Levien
f4afc40101 Merge "framework: fix bug for uninitialized variable" 2012-09-14 11:52:11 -07:00
Katie McCormick
d21b9a9e21 am 2f140f96: Merge "Doc change: GCM changes" into jb-dev 
* commit '2f140f9692c3f8e8ae278839637ff5f72d145c60':
  Doc change: GCM changes
 2012-09-13 09:39:50 -07:00
John Wang
f5cbd7628d Merge "Show plmn in emergency call allowed mode." into jb-dev 2012-09-13 09:36:48 -07:00
Katie McCormick
2f140f9692 Merge "Doc change: GCM changes" into jb-dev 2012-09-13 09:36:48 -07:00
John Wang
b11ce4284e Show plmn in emergency call allowed mode. 
When emergency call is allowed, plmn string is used to pass up the
"Emergency calls only" string. This change set showPlmn to true
in that situation regardless the SIMRecords.SPN_RULE_SHOW_PLMN value.

bug:7103854
Change-Id: I35ce0cc265d648191cb3b5f87261895f862143db
 2012-09-12 16:46:41 -07:00
Katie McCormick
4e11e3e962 Doc change: GCM changes 
Bug: 7072792

Change-Id: I718e407647571d093996139b857f703c104d4e4d
 2012-09-12 14:05:34 -07:00
Elliott Hughes
40ad466e4e am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit '4c686dad83b6712e0e1abab6aba9c7bb683000b2':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:06:56 -07:00
Elliott Hughes
4c686dad83 am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:04:45 -07:00
Scott Main
53d1864c10 am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit '8dc0ff07c9713945b0075dd1010057a47cb8c40b':
  fix another link in the style doc
 2012-09-12 10:43:57 -07:00
Scott Main
8dc0ff07c9 Merge "fix another link in the style doc" into jb-dev 2012-09-12 10:41:20 -07:00
Scott Main
816518fa59 fix another link in the style doc 
Change-Id: Icd40456ab32232eacc6fa3acdd86ff78aa03e3aa
 2012-09-12 10:40:29 -07:00
Elliott Hughes
cceed1dfe1 Merge "Include <sys/socket.h> instead of <linux/socket.h>." 2012-09-12 10:13:28 -07:00
Scott Main
eb0b6e272f am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit '94b2b5efa017138663e00e23e138333149641023':
  fix links to style and themes source files
 2012-09-12 10:11:00 -07:00
Scott Main
94b2b5efa0 Merge "fix links to style and themes source files" into jb-dev 2012-09-12 10:08:36 -07:00
Scott Main
600a75c31f fix links to style and themes source files 
Change-Id: I49759c689c3d345be014c7a252e266d7529af230
 2012-09-12 10:05:38 -07:00
The Android Open Source Project
4b0764eef2 Reconcile with jb-mr0-release - do not merge 
Change-Id: I41a4b710eb0846eaf276f21b75c8d9bb2f76c977
 2012-09-12 07:49:49 -07:00
Daniel Sandler
de3debd9f5 Fix notification gestures. 
Broken by recent changes to ScaleGestureDetector, which we
were using incorrectly.

Change-Id: Ie5a7981cc14873d34de9041f59b5de442c948a61
 2012-09-11 22:20:12 -07:00
Daniel Sandler
40c6ae4d22 Single finger notification expansion. 
If you liked these changes...

  Change Ie4e79aa5
  Change I8a6f8606
  Change I824937e9
  Change I957b6d50

You'll love this one!

Change-Id: I5256366175fa7ebc965b1c5df02f10ba802ed977
 2012-09-11 22:19:50 -07:00
Daniel Sandler
b802699618 am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit 'e445c25877bac16ea4438057f37bc668315133cd':
  Fix notification gestures.
 2012-09-11 21:30:49 -07:00
Daniel Sandler
2da1e2215f am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit 'a5e042f9232c26505968d8add60f3f84c6a87dae':
  Single finger notification expansion.
 2012-09-11 21:29:06 -07:00
Daniel Sandler
e445c25877 Merge "Fix notification gestures." into jb-dev 2012-09-11 21:19:23 -07:00
Daniel Sandler
a5e042f923 Merge "Single finger notification expansion." into jb-dev 2012-09-11 21:17:41 -07:00
Elliott Hughes
778c859bfd Include <sys/socket.h> instead of <linux/socket.h>. 
In newer kernels, <linux/socket.h> no longer contains some of the stuff you're
using.

Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
 2012-09-11 18:50:25 -07:00
Daniel Sandler
c0229e29de Fix notification gestures. 
Broken by recent changes to ScaleGestureDetector, which we
were using incorrectly.

Change-Id: Ie5a7981cc14873d34de9041f59b5de442c948a61
 2012-09-11 21:46:39 -04:00
Xavier Ducrohet
f5de650ff1 Add --output-text-symbols option to aapt. 
Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.

However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.

For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.

This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).

Change-Id: I4db959fec372cf3ead9950e4b2b82fa1ae7eed2d
 2012-09-11 18:19:00 -07:00
Xavier Ducrohet
7714a2429b Add --error-on-failed-insert option to aapt. 
The new SDK build system give the ability to insert
versionCode/Name and min/targetSdkVersion in the manifest
but aapt won't replace those if they already exist.

The main problem is that aapt doesn't actually fail when
it doesn't replace them, making the output not what the
developer wanted.

This patch set adds an option to aapt to make it return
an error if the insert failed because the attribute
already existed.

Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9
 2012-09-11 18:17:22 -07:00
Jean-Baptiste Queru
c095eb04fa am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit '70a5967e0bb295f64c99593043f138fdd62365f4':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 17:59:14 -07:00
Jean-Baptiste Queru
70a5967e0b am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit '5c09d605678d64e05579bb668b615764a714f1f7':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 17:57:19 -07:00
Jean-Baptiste Queru
5c09d60567 Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 2012-09-11 17:48:09 -07:00
Scott Main
91de90daad am 01f9bf3f: small update to the ADT installation steps based on new ADT UI 
* commit '01f9bf3fefd7e78f8356cfcb18e945f58e6eb38b':
  small update to the ADT installation steps based on new ADT UI
 2012-09-11 15:41:58 -07:00
Scott Main
01f9bf3fef small update to the ADT installation steps based on new ADT UI 
Change-Id: I1c3ddfcb6188dd0bdc87a2b2e8241dfd7fcaa4dc
 2012-09-11 15:24:16 -07:00
Robert Greenwalt
5d33e76cff am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:04:50 -07:00
Robert Greenwalt
2415841c37 Merge "EthernetDataTracker: indicate link up based on flags" 2012-09-11 15:02:24 -07:00
Vishal Mahaveer
b6b72f5411 EthernetDataTracker: indicate link up based on flags 
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.

Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-09-11 16:41:16 -05:00
Wink Saville
72c06bcf19 am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum" 
* commit '0c99f7e36da7ebc92d0a084f3dc1717a7c31423e':
  Telephony: Clarify IccCardConstants.State enum
 2012-09-11 13:19:18 -07:00
Wink Saville
0c99f7e36d am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum" 
* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
  Telephony: Clarify IccCardConstants.State enum
 2012-09-11 13:17:17 -07:00
Wink Saville
ba3cf72a08 Merge "Telephony: Clarify IccCardConstants.State enum" 2012-09-11 12:24:15 -07:00
Daniel Sandler
7ffa04b1dd Single finger notification expansion. 
If you liked these changes...

  Change Ie4e79aa5
  Change I8a6f8606
  Change I824937e9
  Change I957b6d50

You'll love this one!

Change-Id: I5256366175fa7ebc965b1c5df02f10ba802ed977
 2012-09-11 15:19:44 -04:00
Scott Main
c02b5008c1 am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev 
* commit 'c0e0d2bf3db18eaa2b94608654784cad29f96b23':
  docs: update for multi apk doc for ABI support
 2012-09-11 10:50:40 -07:00