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

6334 Commits

Author SHA1 Message Date
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
b0f895b330 Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 2012-11-19 14:27:45 -08:00
Baligh Uddin
0505b8bfab am 17936f01: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '17936f0187d4f410a54d32cdc1915e38227d95a0':
  Import translations. DO NOT MERGE
 2012-11-16 17:38:10 -08:00
Baligh Uddin
3a3a84e4d6 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-16 17:38:07 -08:00
Baligh Uddin
17936f0187 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-16 17:35:08 -08:00
Fabrice Di Meglio
62107ce46c am 13fbac66: am 1f33e642: Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev 
* commit '13fbac66314322740703006be23a55e581e21fcf':
  Fix keyguard pin/simpin/simpuk RTL-ization
 2012-11-16 16:42:26 -08:00
Jim Miller
05163aa3d5 Fix keyguard pin/simpin/simpuk RTL-ization 
This fixes the PIN, SIM PIN, and SIM PUK keyboards to keep the keys in the same
position for all languages.

Fixes bug 7538528

Change-Id: Ib07e89e9496e6c5b91c1bbda7781eddeddea0554
 2012-11-16 14:56:57 -08:00
Baligh Uddin
116133a2a6 Import translations. DO NOT MERGE 
Change-Id: I8187a141a3949c9c1678912b13267b21398a6c5e
Auto-generated-cl: translation import
 2012-11-16 13:51:42 -08:00
Baligh Uddin
1d1b7f05df Import translations. DO NOT MERGE 
Change-Id: Ia94359fa60af4992757b0d03a434cb7ab413f8cd
Auto-generated-cl: translation import
 2012-11-16 13:47:23 -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
7420ab681e Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 2012-11-15 11:47:36 -08:00
Baligh Uddin
aaf3fbc665 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-15 08:03:08 -08:00
Baligh Uddin
9d6cf4e1c3 am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'f118bcc5b276f54af9b9f2248867a7eff5bc92ad':
  Import translations. DO NOT MERGE
 2012-11-15 08:01:34 -08:00
Baligh Uddin
f118bcc5b2 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-15 07:59:36 -08:00
Daniel Sandler
1812b34503 am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '2bb5dc6a367ce869939728b2978be7ca61a4b8b8':
  Notification vibration improvements:
 2012-11-15 06:17:31 -08:00
Fabrice Di Meglio
7d529cd6eb Fix Javadoc for View layoutDirection / textDirection / textAlignment 
Change-Id: I2fa2f02bd2f59ee93ccd56fc6bd28b93e4713cc4
 2012-11-14 18:09:30 -08:00
Daniel Sandler
edbb380950 Notification vibration improvements: 
- When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use a different
   vibration pattern.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
 2012-11-14 11:50:11 -08:00
Baligh Uddin
0a26a6ca82 Import translations. DO NOT MERGE 
Change-Id: I13afa2f030ae612ee052a52180bfd00d2f49b1e7
Auto-generated-cl: translation import
 2012-11-14 10:13:51 -08:00
Baligh Uddin
9e5475ff4c Import translations. DO NOT MERGE 
Change-Id: I9ad763b503ee41237e4ff5de0b19055e22c75acf
Auto-generated-cl: translation import
 2012-11-14 10:09:02 -08:00
Jeff Sharkey
53f6e8a9b9 Utility to format human-friendly durations. 
Bug: 6777872
Change-Id: Ie7ebcb456306f4f88b4707030dd7beda3fc90368
 2012-11-13 17:26:39 -08:00
Michael Jurka
7538644638 am 81b74a61: am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 
* commit '81b74a61d76ac97cdcf89a6548b962d41093b0d6':
  Add xxhdpi version of default activity icon
 2012-11-13 10:47:09 -08:00
Michael Jurka
c1d5db7963 Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 2012-11-13 10:36:26 -08:00
Baligh Uddin
9885af0558 am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9508e31dcd41bbdbff255913b72489af95e9bd0c':
  Import translations. DO NOT MERGE
 2012-11-13 08:53:29 -08:00
Baligh Uddin
5dabdb78c9 am bda180a6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'bda180a6d58a6e87c596d18b9a145e0120976f99':
  Import translations. DO NOT MERGE
 2012-11-12 16:27:36 -08:00
Michael Jurka
dac181319a Add xxhdpi version of default activity icon 
Bug: 7400295
 2012-11-12 14:12:46 -08:00
Baligh Uddin
fadf669344 Import translations. DO NOT MERGE 
Change-Id: Ic0e6487087282230326fbd20063b47ad9205ee53
Auto-generated-cl: translation import
 2012-11-12 07:40:52 -08:00
Baligh Uddin
d300d3efa3 Import translations. DO NOT MERGE 
Change-Id: Ic7c196abf01d9eab7c1d32dba4eb974979b6d38a
Auto-generated-cl: translation import
 2012-11-12 07:39:10 -08:00
Jean-Baptiste Queru
e499803e82 Re-merge translations - do not merge 
Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
 2012-11-09 07:32:57 -08:00
Chris Wren
b3e8071d81 am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 
* commit 'b1d094ba104f804d152b83517bb7500304f6bae8':
  allow pattern linear layout to manage message_area.
 2012-11-08 15:47:36 -08:00
Jim Miller
b67cba3355 am 2b49dd1c: am 6c7d2c24: am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 
* commit '2b49dd1c6e0bc9e0fee38f4bdf8889cb791ca81e':
  Don't show ECA in landscape mode on phones.
 2012-11-08 15:47:09 -08:00
Jim Miller
061b4fae3d am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 15:47:04 -08:00
Adam Powell
70eeec5c06 am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b':
  add bouncer frame to glowpad.
 2012-11-08 15:46:58 -08:00
Daniel Sandler
b57693d7c4 am e7689b82: am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit 'e7689b82fa8a544289e7bcbb33ac6b33da6c9648':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 15:46:32 -08:00
Adam Powell
805f386d51 am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit 'ef79efdc479ea8d5ec623c14260e775f9e6a474b':
  Fiddle with keyguard glowpad layouts
 2012-11-08 15:46:25 -08:00
Winson Chung
1540a21f3d am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 
* commit '29f161781c4544c7b1e78c8d1ae07605b3dcde86':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 15:45:59 -08:00
Adam Cohen
bd8c736bfd am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit '79d4bf6e2f241d9d648789cdd5170e48614cc764':
  Fixing up overscroll asset / sizing
 2012-11-08 15:45:55 -08:00
Jim Miller
0927eb2112 am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
  Implement fallback clock in keyguard
 2012-11-08 15:45:43 -08:00
Adam Cohen
92f828f2a4 am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '24b1764e6c1996926ecba280f236ab05cec68b2c':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 15:45:35 -08:00
Chris Wren
1ed908ec37 am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 
* commit '193cd46c47e7552c6b92b20aef51064d87e88d84':
  Don't pop the IME for passwors at ScreenOn on tablets.
 2012-11-08 15:33:31 -08:00
Brian Colonna
318e81896b am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 
* commit '1e85c8edfb39aa951134599b6019a7fa4fc8b4a7':
  Centering FUL fixes b/7480608
 2012-11-08 15:33:27 -08:00
Adam Powell
c4e0614bca am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking 
* commit 'e7394d1eef3ef8a89ec6ceea8f0318f38ac67b33':
  Keyguard layout tweaking/reworking
 2012-11-08 15:33:09 -08:00
Daniel Sandler
744fa85f12 am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit 'f6a5070bf59ecc5497196f923930d28286b49287':
  Updated assets.
 2012-11-08 15:33:05 -08:00
Jean-Baptiste Queru
c23cfe57a9 Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD 2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
5189fca3df Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD 2012-11-08 14:48:28 -08:00
Jean-Baptiste Queru
de8717c5f2 Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD 2012-11-08 14:44:44 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
d35f576ea0 Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD 2012-11-08 14:40:34 -08:00
Jean-Baptiste Queru
ce2a3746b8 merge 19f8aa180a7ccb29b11a322378002e37517abfc9 
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
 2012-11-08 14:13:21 -08:00
Chris Wren
f080dc0c7d am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 
* commit '7d59cf9f10c38a020c7104e3bd5b358ab2144ab5':
  allow pattern linear layout to manage message_area.
 2012-11-08 13:09:08 -08:00
Jim Miller
6c7d2c248c am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 
* commit 'e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc':
  Don't show ECA in landscape mode on phones.
 2012-11-08 13:08:45 -08:00