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

38017 Commits

Author SHA1 Message Date
Romain Guy
dccf9337e6 Merge "Add support for face attribute to HTML string resources Bug #7480719" 2012-11-27 14:35:24 -08:00
Romain Guy
a8f6d5f072 Add support for face attribute to HTML string resources 
Bug #7480719

This change also adds the alias "color" for the attribute "fgcolor".
This change also unifies HTML colors parsing between the Html class
and StringBlock for consistency.

Change-Id: I696a6e080387901d88e9baf7cb989b892f14b9db
 2012-11-27 14:34:33 -08:00
Romain Guy
498486e002 Merge "Reset stored background resource when setting a bg color" 2012-11-27 14:10:24 -08:00
Romain Guy
f6ae4b897b Reset stored background resource when setting a bg color 
This sequence of operations would prevent the background from
changing:

setBackgroundResource(R.something)
setBackgroundColor(aColor)
setBackgroundResource(R.something)

The last call would be no-oped.

Change-Id: I436a33599c88e35f6f36bdd63e9c256c9219e052
 2012-11-27 13:57:27 -08:00
Baligh Uddin
6f65b352a4 Import translations. DO NOT MERGE 
Change-Id: If8c2f4d122f4f99ac8af2912be919f8345b17410
Auto-generated-cl: translation import
 2012-11-27 12:54:58 -08:00
Romain Guy
f6e7b2089d Merge "Add new mipMap attribute to BitmapDrawable" 2012-11-27 11:04:57 -08:00
Romain Guy
5769fcd88a Add new mipMap attribute to BitmapDrawable 
This attribute can be used to enable/disable mipmapping on bitmaps.
See Bitmap.setHasMipMap() for details.

Change-Id: I13cc800a258b6876a94e2a9605dcec4ea4f1ea48
 2012-11-27 11:03:22 -08:00
Chet Haase
62d3fd89ec am 161194da: am d8a6b544: am 21243369: Merge "Fix infinite recursive loop" 
* commit '161194daad7cee031475648be294e5e9d4bc6d68':
  Fix infinite recursive loop
 2012-11-27 09:41:16 -08:00
Chet Haase
161194daad am d8a6b544: am 21243369: Merge "Fix infinite recursive loop" 
* commit 'd8a6b5445c070e1ab5d86a87e6669340591625d7':
  Fix infinite recursive loop
 2012-11-27 09:39:16 -08:00
Chet Haase
d8a6b5445c am 21243369: Merge "Fix infinite recursive loop" 
* commit '2124336984cb6c189f03c271636a1cc8babb2371':
  Fix infinite recursive loop
 2012-11-27 09:37:23 -08:00
Chet Haase
2124336984 Merge "Fix infinite recursive loop" 2012-11-27 08:34:18 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -08:00
Przemyslaw Szczepaniak
2d940bcbd1 Make TTS input string limit public and documented. 
TTS input limit is now publicly available from getMaxSpeechInputLength()
static method.

Bug: 7456118
Change-Id: Ib2afbb7202ad9dc15895f322fbd1480a5f1f7278
 2012-11-27 03:25:27 -08:00
Scott Kennedy
c40d1153e0 Unhide SparseLongArray 
Because it's useful.

Change-Id: I6c71a49eed2c0c366e8afa874ebbc48cfe816a90
 2012-11-26 17:51:04 -08:00
Winson Chung
26c8a8c912 am e41ea2c0: am 037e8ee2: am 9a0fbd4c: Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 
* commit 'e41ea2c0888964a5feb5836260f7f93cd36e0a8f':
  Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
 2012-11-26 11:53:00 -08:00
Winson Chung
e41ea2c088 am 037e8ee2: am 9a0fbd4c: Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 
* commit '037e8ee26f9fa6e2f30d9501a4db43161904c905':
  Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
 2012-11-26 11:50:59 -08:00
Winson Chung
037e8ee26f am 9a0fbd4c: Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 
* commit '9a0fbd4c6da2905504defdba9843d3fcbe0c1367':
  Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
 2012-11-26 11:49:30 -08:00
Winson Chung
9a0fbd4c6d Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 2012-11-26 11:46:39 -08:00
Craig Mautner
f4f35f8e8d am 1ee927f4: am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 
* commit '1ee927f42bea9817fc16d5ee6532ce46e099f4b4':
  Ignore invalid combination of PowerManager flags.
 2012-11-26 11:45:25 -08:00
Craig Mautner
1ee927f42b am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 
* commit '8de91ce1e037408064f453b26f1fe725cd6377e3':
  Ignore invalid combination of PowerManager flags.
 2012-11-26 11:43:28 -08:00
Craig Mautner
8de91ce1e0 am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 
* commit '7f2a98967532138f3f962216ccf2d1a8307d42de':
  Ignore invalid combination of PowerManager flags.
 2012-11-26 11:41:17 -08:00
Winson Chung
4752e7d1a9 Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782) 
- Also adding feedback on the plus page (Bug 7500328)

Change-Id: Iddd09b7a3d5347a43bc040052114879cbaecccd9
 2012-11-26 11:36:40 -08:00
Craig Mautner
7f2a989675 Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 2012-11-26 11:34:40 -08:00
Baligh Uddin
9f9d17cafb Merge "Import translations. DO NOT MERGE" 2012-11-26 09:20:11 -08:00
Baligh Uddin
652543fb4a am effb0191: Import translations. DO NOT MERGE 
* commit 'effb0191ba360e133eaf41693005b2ace2b009bd':
  Import translations. DO NOT MERGE
 2012-11-26 09:17:00 -08:00
Chet Haase
60b5509ff1 Merge "Fix layout-in-layout logic" 2012-11-26 07:20:16 -08:00
Baligh Uddin
18f3bdda1e Import translations. DO NOT MERGE 
Change-Id: Iaff2592ce93e54835624d2d0c49aace8802a9f41
Auto-generated-cl: translation import
 2012-11-22 22:01:24 -08:00
Baligh Uddin
bbe3cbee5b Import translations. DO NOT MERGE 
Change-Id: I33e42bf56fda90ee829e0ad91c46ecd859eca0ae
Auto-generated-cl: translation import
 2012-11-22 21:54:25 -08:00
Baligh Uddin
f7f1c6a78e Import translations. DO NOT MERGE 
Change-Id: I9f2a464733eb765385c3f8f83bbcd1a1e33b0e26
Auto-generated-cl: translation import
 2012-11-22 21:52:46 -08:00
Baligh Uddin
effb0191ba Import translations. DO NOT MERGE 
Change-Id: I19ab9e770f5db475222e850fdb145593078656cc
Auto-generated-cl: translation import
 2012-11-22 21:51:02 -08:00
László Dávid
c5d43f76fd Fix infinite recursive loop 
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
 2012-11-23 00:26:22 +01:00
Baligh Uddin
ef34cd684b Merge "Import translations. DO NOT MERGE" 2012-11-22 11:04:34 -08:00
Baligh Uddin
7e6c3e8f6e am a15958a2: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a15958a2bd1916dc0e96d893a217494779ae9515':
  Import translations. DO NOT MERGE
 2012-11-22 11:04:07 -08:00
Svetoslav Ganov
6ce77cdd6a Adding dump support for the accessibility manager service. 
Change-Id: Ibc8d9eac3be065f1a753e1401568b8f93263b051
 2012-11-21 16:38:50 -08:00
Chet Haase
d5a835259d Fix layout-in-layout logic 
Fix to allow requestLayout() during layout needs to disable
the "currently doing layout" flag while it processes the requests
that came in during layout to allow these initial requests to go
through unhindered.

Change-Id: Ied5ff1589224792f153cc10f65e004f14724523d
 2012-11-21 16:30:07 -08:00
Craig Mautner
6edb6db512 Ignore invalid combination of PowerManager flags. 
ACQUIRE_CAUSES_WAKEUP is supposed to be ignored if combined with
PARTIAL_WAKE_LOCK. Instead it was being carried out for any values
of the WakeLock level.

This change reverts behavior to closely match
previous releases of the framework by only honoring
ACQUIRE_CAUSES_WAKEUP for screen wake lock levels. The only
difference being that in previous releases ACQUIRE_ could have been
combined with PROXIMITY_SCREEN_OFF_WAKE_LOCK (it never was) and
now such a combination will ignore the ACQUIRE_ flag.

Bug 7532258 fixed.

Change-Id: I46e848d8fd1b57e54c63141bf3d4f353986b5bdf
 2012-11-21 13:19:39 -08:00
Baligh Uddin
aae5fb42cc Import translations. DO NOT MERGE 
Change-Id: I47fc111ea3f6e2e2e63e1ba2a54bd94d81155b54
Auto-generated-cl: translation import
 2012-11-20 22:44:58 -08:00
Baligh Uddin
458f43b550 Import translations. DO NOT MERGE 
Change-Id: I646dee02eeb319d87d5210faaa3025c50f85da86
Auto-generated-cl: translation import
 2012-11-20 22:37:24 -08:00
Baligh Uddin
0edbc0eb76 Import translations. DO NOT MERGE 
Change-Id: Ia01f5cbaa9a00034cf6bd277cb483bf0465d12e6
Auto-generated-cl: translation import
 2012-11-20 22:35:34 -08:00
Baligh Uddin
1b85b9058f Import translations. DO NOT MERGE 
Change-Id: I9a4ce3d014a8f7b264fe59eb51e747f36d16a226
Auto-generated-cl: translation import
 2012-11-20 22:33:48 -08:00
Adam Powell
47a74f375a am 732e589c: am 6e8c1495: Merge "Re-read shortcut labels if the language has changed" 
* commit '732e589c1040cb29deac499ae155bbb7c7358def':
  Re-read shortcut labels if the language has changed
 2012-11-20 15:07:23 -08:00
Adam Powell
732e589c10 am 6e8c1495: Merge "Re-read shortcut labels if the language has changed" 
* commit '6e8c1495f6a65124750155409ce326736744a42b':
  Re-read shortcut labels if the language has changed
 2012-11-20 15:05:13 -08:00
Fabrice Di Meglio
742524b216 am 3ee47400: am 95263ef3: am 4d931acd: Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev 
* commit '3ee4740009b0e217ee0f6de0f86f2f557b175dea':
  Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode
 2012-11-20 14:44:46 -08:00
Fabrice Di Meglio
3ee4740009 am 95263ef3: am 4d931acd: Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev 
* commit '95263ef3cf4c0df65950d2cddda843aabac6fa48':
  Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode
 2012-11-20 14:42:13 -08:00
Fabrice Di Meglio
95263ef3cf am 4d931acd: Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev 
* commit '4d931acdb85df1f9d1577cf05686601a6c2fb4cc':
  Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode
 2012-11-20 14:40:18 -08:00
Fabrice Di Meglio
4d931acdb8 Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev 2012-11-20 14:37:55 -08:00
Adam Powell
6e8c1495f6 Merge "Re-read shortcut labels if the language has changed" 2012-11-20 13:59:45 -08:00
Craig Mautner
38acfe291a Merge "Refactor unused methods and unnecessary members." 2012-11-20 12:33:59 -08:00
Amith Yamasani
c0a9edb6b7 Merge "Make NTP constants configurable." 2012-11-20 12:30:13 -08:00
Jaewan Kim
c3560b81db Make NTP constants configurable. 
Bug: 6943067
Change-Id: I0b0f9076fba99e9c457ef7180b9936c0d2a7d589
 2012-11-21 03:49:37 +09:00