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

80529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
08ec998bb3 am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support 
* commit 'a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
  docs: update for multi apk doc for ABI support
 2012-09-18 10:45:00 -07:00
Katie McCormick
0a94b84def am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '917d45e3d1a2d405aa0996889c40554b4a508fe1':
  Doc update: Appwidgets JB additions.
 2012-09-18 10:44:57 -07:00
Scott Main
21c5007ed4 am 8a80ac46: am 54efa69f: older not lower 
* commit '8a80ac469050135ce2c126bc690e352522b7cee3':
  older not lower
 2012-09-18 10:44:53 -07:00
Joe Fernandez
77ae2e6f27 am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit 'b9b05dfcc1deba0e5daefe13231327432cdb6cc3':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-18 10:44:50 -07:00
Scott Main
db6313ceba am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit '0cc7398ab9196cf3ae8075f8e7bd055a900ebb2e':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-18 10:44:46 -07:00
Katie McCormick
f5c717a96c am 2141c068: am 243170f7: Doc update: Fix typo. 
* commit '2141c06849cb5b2f5bea06a79de66b7de4112ac9':
  Doc update: Fix typo.
 2012-09-18 10:44:42 -07:00
Scott Main
5c97d966cc am 9ae01846: fix broken link for action bar pack 
* commit '9ae018462a5fa44e3e1d4837942b5fd880531124':
  fix broken link for action bar pack
 2012-09-18 10:44:32 -07:00
Jean-Baptiste Queru
7f5de0161b Skip f5cbd762 - it's in frameworks/opt/telephony 
Change-Id: Ifeeeab4e2672c9c71b9a1298e13e12005b53f801
 2012-09-18 08:01:17 -07:00
Xavier Ducrohet
79c95c3b50 am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit '5de9603529ee01a416b5fa31074197565fde4482':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:05:36 -07:00
Xavier Ducrohet
8a67598eb7 am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit 'cc9747ed45302956a3ec9dd21f7b950b837dbfdd':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:05:30 -07:00
Xavier Ducrohet
5de9603529 am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:03:19 -07:00
Xavier Ducrohet
cc9747ed45 am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:03:12 -07:00
Scott Main
a1981bc1ab am d5abc558: docs: update for multi apk doc for ABI support 
* commit 'd5abc5586e08bedf06f337aefa5a59c014fb7a2e':
  docs: update for multi apk doc for ABI support
 2012-09-17 11:20:16 -07:00
Katie McCormick
917d45e3d1 am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '73ec048e4de50419d2d49907be0acae0893f92ca':
  Doc update: Appwidgets JB additions.
 2012-09-17 11:20:12 -07:00
Scott Main
8a80ac4690 am 54efa69f: older not lower 
* commit '54efa69f5074568f23eb5ff7f15022eece11918c':
  older not lower
 2012-09-17 11:20:09 -07:00
Joe Fernandez
b9b05dfcc1 am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit '8982939d17881c7dcd20459955f3bfcec6e05905':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-17 11:20:06 -07:00
Scott Main
0cc7398ab9 am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit 'd46023d2081c995b2ec61b48b79f2077dfdb36a2':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-17 11:20:05 -07:00
Katie McCormick
2141c06849 am 243170f7: Doc update: Fix typo. 
* commit '243170f759252c99052a903bd0cb33e4d8227aa0':
  Doc update: Fix typo.
 2012-09-17 11:09:16 -07:00
Xavier Ducrohet
31820a35b2 Merge "Add --output-text-symbols option to aapt." 2012-09-17 10:59:22 -07:00
Xavier Ducrohet
d72525718e Merge "Add --error-on-failed-insert option to aapt." 2012-09-17 10:57:58 -07:00
Scott Main
d5abc5586e docs: update for multi apk doc for ABI support 2012-09-17 10:54:55 -07:00
Katie McCormick
73ec048e4d Doc update: Appwidgets JB additions. 2012-09-17 10:54:17 -07:00
Scott Main
54efa69f50 older not lower 2012-09-17 10:53:32 -07:00
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