Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,227 Commits 3 Branches 0 Tags
e41ea2c0888964a5feb5836260f7f93cd36e0a8f
Commit Graph

28780 Commits

Author SHA1 Message Date
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
Craig Mautner
7f2a989675 Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 2012-11-26 11:34:40 -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
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
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
Svetoslav Ganov
0b64976f19 am 0ee79040: am 15861683: am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 
* commit '0ee790408e19a2a820a080a8b4ad3af63d3a5eca':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
 2012-11-20 08:43:40 -08:00
Svetoslav Ganov
0ee790408e am 15861683: am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 
* commit '1586168302f79d10e85a5aeed7b486c4244cc98e':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
 2012-11-20 08:40:26 -08:00
Svetoslav Ganov
1586168302 am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 
* commit 'e9812bae0e0ce08bd232dc2371fdb959e4f7a318':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
 2012-11-20 08:38:16 -08:00
Svetoslav Ganov
7018cfdc05 Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back) 
This reverted change was adjusting the min and max values for the NumberPicker
which is not desirable since it changes behavior and it will be possible for
an app that works on the current platform to crash on an older one. Also the
adjustment was not implemented correctly.

Updated the documentation to clarify the reltionship between the min value,
max value, and the displayed values array.

Bug:7518172

This reverts commit a1410e6789

Change-Id: I109f1b1f54c1e609941243cabab9241871b6b12b
 2012-11-19 15:20:27 -08:00
Fabrice Di Meglio
e784ae8e6a am d689e8c3: am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 
* commit 'd689e8c3a05f3b200d19879bdc169e6ad6e0436b':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment
 2012-11-19 15:14:02 -08:00
Fabrice Di Meglio
d689e8c3a0 am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 
* commit 'b0f895b330d0d2b6725e7deee158ff20ed9155f8':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment
 2012-11-19 14:31:02 -08:00
Fabrice Di Meglio
b0f895b330 Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 2012-11-19 14:27:45 -08:00
Mattias Falk
eb573418a7 Re-read shortcut labels if the language has changed 
The shortcut label isn't updated to the current language
if the phone's language has changed.

The problem was that the shortcut label is stored in a
static variable which is set once and kept throughout the
life time of the process.

Change-Id: I89c5875fbf28fb82e073166c472ca205d28674fb
 2012-11-19 09:31:19 +01:00
Michael Jurka
3366a5d54e am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:34:20 -08:00
Michael Jurka
cf474b1a10 am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:31:07 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Fabrice Di Meglio
e054ab8538 am 348cf60d: am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit '348cf60dbb1de980aa97e551817765e7b3fa0221':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-15 12:27:03 -08:00
Fabrice Di Meglio
348cf60dbb am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit '674a131cb625a7aae0c6e50a24a968200c71b566':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-15 12:23:53 -08:00
Fabrice Di Meglio
674a131cb6 Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 2012-11-15 12:21:00 -08:00
Jeff Sharkey
9634e97067 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
 2012-11-15 11:56:19 -08:00
Jeff Sharkey
9f43afad9d am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '68363456c1f360c0f1afe637a1f3028519e059ed':
  Utility to format human-friendly durations.
 2012-11-15 11:54:43 -08:00
Jeff Sharkey
bfea4f04f2 am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
  Useful annotations for code documentation.
 2012-11-15 11:53:19 -08:00
Jeff Sharkey
9077ca586e am dcb72dbb: am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit 'dcb72dbb39227674e4a54167efabcdc8add4548a':
  Watch for leaked ParcelFileDescriptors.
 2012-11-15 11:51:49 -08:00
Jeff Sharkey
68363456c1 am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '7420ab681eaad22f4b8f884e12d3b2ce82cd203a':
  Utility to format human-friendly durations.
 2012-11-15 11:51:38 -08:00
Jeff Sharkey
f5377a7242 Merge "Useful annotations for code documentation." into jb-mr1.1-dev 2012-11-15 11:48:38 -08:00
Jeff Sharkey
dcb72dbb39 am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit '445767c14ceb51d2839a7bc818c68c81ee7d80a7':
  Watch for leaked ParcelFileDescriptors.
 2012-11-15 11:47:43 -08:00
Jeff Sharkey
7420ab681e Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 2012-11-15 11:47:36 -08:00
Jeff Sharkey
445767c14c Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 2012-11-15 11:45:23 -08:00
Fabrice Di Meglio
8701bb90db Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR 
- change heuristic to LTR.

Change-Id: I3c5f413e48ceddbd931d713eb8c168431fcd09a2
 2012-11-14 19:57:11 -08:00
Fabrice Di Meglio
7d529cd6eb Fix Javadoc for View layoutDirection / textDirection / textAlignment 
Change-Id: I2fa2f02bd2f59ee93ccd56fc6bd28b93e4713cc4
 2012-11-14 18:09:30 -08:00
Fabrice Di Meglio
bb0cbae441 Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode 
- keep the Error Drawable infos into the Drawables cache
- reset left/right Drawable state before resolving where to put the Error Drawable
- get the mirrored Drawable for the Error popup background
- set the Error popup position depending on the layout direction (so that the "triangle"
of the background is pointing to the middle of the Error icon)

One restriction: we load the Error popup background Drawable corresponding to the layout
direction of the System Locale. So if you set the Layout direction on a TextView (or
an EditText) to RTL and set an error to it when you are in a RTL System Locale, then you
see that the background "triangle" is not pointing to the Error icon. This is working as
intended as the AssetManager load the Drawable resource depending on the configuration
which is in that case the RTL one thus loading the RTL version of the background (and not
the LTR one).

Thus there can be a discrepancy between the "layout direction" of the TextView
and the one from the Error popup background. This would happen only thru using the SDK and
not in a normal case when running an App.

Change-Id: I91bbfbe46ac20efe0e585c5d4c766db23b5c709d
 2012-11-14 16:41:24 -08:00
Kenny Root
09de4dad57 am e4163e96: Merge "Switch keystore to binder" 
* commit 'e4163e96e0ee31c6e78434114cc1dcf4cd3ab5bd':
  Switch keystore to binder
 2012-11-14 15:25:57 -08:00
Kenny Root
6b77645aa9 Switch keystore to binder 
Change-Id: I9fa1fc05068bee1eed3f618fb32f70cf3d4c05d4
 2012-11-14 08:45:52 -08:00
Jeff Sharkey
53f6e8a9b9 Utility to format human-friendly durations. 
Bug: 6777872
Change-Id: Ie7ebcb456306f4f88b4707030dd7beda3fc90368
 2012-11-13 17:26:39 -08:00
Joe Malin
9ae6845ae8 am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '27b587b6867768860c2e3f13567ba3d312d9b952':
  Notification.java javadoc: addAction
 2012-11-13 14:30:51 -08:00
Joe Malin
27b587b686 am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit 'faa38a08d5998e32dcfe21e084076cbbb64ca0ea':
  Notification.java javadoc: addAction
 2012-11-13 14:28:40 -08:00
Joe Malin
faa38a08d5 am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '4422596ddb295f812bb0970ec7f75d3c45d05020':
  Notification.java javadoc: addAction
 2012-11-13 14:26:44 -08:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
 2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
 2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
 2012-11-13 14:20:54 -08:00
Fabrice Di Meglio
bb67d48606 am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit 'a97f5b8c2585c87e1b82e5ce3b7aab149668a711':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:07:30 -08:00
Fabrice Di Meglio
a97f5b8c25 am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit '9d82d324de7d544c95458faa05a87014e53e8892':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:05:58 -08:00
Fabrice Di Meglio
9d82d324de Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 2012-11-13 11:03:19 -08:00
Craig Mautner
50acd73173 am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit '67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:04:27 -08:00
Craig Mautner
67a3fb6f3b am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit 'c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:02:21 -08:00
Craig Mautner
c10914ca5c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 2012-11-13 10:00:04 -08:00