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

7940 Commits

Author SHA1 Message Date
Geoff Mendal
ebd532bc35 Import translations. DO NOT MERGE 
Change-Id: Ia61d25e126fd677f5d3dcded34a56e782cd8fea8
Auto-generated-cl: translation import
 2014-10-06 15:17:06 -07:00
Baligh Uddin
589cda806b Merge "Import translations. DO NOT MERGE" 2014-10-05 17:49:34 +00:00
Baligh Uddin
0e33b1a2a6 Import translations. DO NOT MERGE 
Change-Id: I94ea057516c95dbc1ed583b64d69e638d14d81ee
Auto-generated-cl: translation import
 2014-10-04 14:43:55 -07:00
Jorim Jaggi
479a34ca4a am 83c7963c: am 711ea1e5: am 23f07789: am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit '83c7963c2a8b84476fffa05ede638944639ae1e3':
  Fix blank Keyguard #4
 2014-10-04 16:20:32 +00:00
Jorim Jaggi
83c7963c2a am 711ea1e5: am 23f07789: am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit '711ea1e5e25eaaf7bb1eb4ffb63ef08b339f61f2':
  Fix blank Keyguard #4
 2014-10-04 16:13:56 +00:00
Jorim Jaggi
ed8ee2b3bf am a94d2c54: am 5c9f0987: am 85701394: am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit 'a94d2c5442275c38e585c93babd297bb24ee65c4':
  Fix blank lockscreen #3
 2014-10-04 16:06:05 +00:00
Jorim Jaggi
a94d2c5442 am 5c9f0987: am 85701394: am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit '5c9f0987fce29a78f79429947c00b14f5a8b4504':
  Fix blank lockscreen #3
 2014-10-04 15:45:25 +00:00
Elliott Hughes
dff75073d4 resolved conflicts for merge of 9f22aef0 to master 
Change-Id: I81f49dacc90f0f6ef3ce7b20fe88e543b383aec8
 2014-10-03 17:38:48 -07:00
Jorim Jaggi
23f0778983 am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit '3c6300da713a7407a3fcfba126ef912ea7bc21bc':
  Fix blank Keyguard #4
 2014-10-04 00:11:22 +00:00
Jorim Jaggi
3c6300da71 am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit 'eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
  Fix blank Keyguard #4
 2014-10-04 00:04:22 +00:00
Jorim Jaggi
8570139447 am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit 'a359df01e012b194870d322fb1c16a6436d79f89':
  Fix blank lockscreen #3
 2014-10-03 23:57:33 +00:00
Jorim Jaggi
a359df01e0 am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
  Fix blank lockscreen #3
 2014-10-03 23:53:09 +00:00
Jorim Jaggi
5e08e6957d Fix blank Keyguard #4 
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.

Bug: 17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
 2014-10-03 15:52:24 -07:00
Elliott Hughes
9f22aef0c9 resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I79418b166b9efbc2ca028a05ec04e5a7fd667ee6
 2014-10-03 15:29:32 -07:00
Elliott Hughes
1fb235aa9b Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 2014-10-03 21:42:38 +00:00
Jorim Jaggi
449981be16 Fix blank lockscreen #3 
Bug: 17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
 2014-10-03 14:24:55 -07:00
Elliott Hughes
88d255107d Fix percentage formatting in SystemUI. 
Also remove some orphaned strings that tried to format percentages wrongly.

(The ar and fa localizations will be clobbered, but this lets you test this
change independently.)

Bug: 15476051
Change-Id: Ifd97d47446bdd2e95298b04e1a11542dfed7f9a1
 2014-10-03 12:06:17 -07:00
John Spurlock
9d6c4784ac am 8005c38e: am e02d4b0e: am 0dbc6f32: am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit '8005c38e179e8fde20ddd6af1edc495ee4a10ad3':
  Update framework icons for media & alarm streams.
 2014-10-03 14:24:10 +00:00
John Spurlock
8005c38e17 am e02d4b0e: am 0dbc6f32: am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit 'e02d4b0ef382415c976f7aa1a398c8d61fcd5216':
  Update framework icons for media & alarm streams.
 2014-10-03 14:18:39 +00:00
John Spurlock
0dbc6f328e am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit '7da91cc21f0f77277d76001af9133de3923ba686':
  Update framework icons for media & alarm streams.
 2014-10-03 14:05:47 +00:00
John Spurlock
7da91cc21f am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
 2014-10-03 14:00:29 +00:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams. 
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
 2014-10-02 20:11:37 -04:00
Neil Fuller
ebf2e8b451 am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
* commit 'c2a0b4482d7144e8382346ea4c22c7b89368fec0':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 13:39:55 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
John Spurlock
1637b695ec am 9ab7d0a7: am a0aa089b: am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit '9ab7d0a736278b87f9e4d0804596ca6f8d5cfe02':
  Doze: Route volume keys to music only while pulsing.
 2014-10-02 12:52:59 +00:00
Winson Chung
344c45aa6c am 7716f1b6: am 98391728: am 0dad6a07: am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous 
* commit '7716f1b6097491f60bd628a31eede17b7e3c0e53':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-02 12:52:54 +00:00
John Spurlock
9ab7d0a736 am a0aa089b: am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit 'a0aa089bcf8358f93c4eef33cfe409238ccecd39':
  Doze: Route volume keys to music only while pulsing.
 2014-10-02 12:38:40 +00:00
Winson Chung
7716f1b609 am 98391728: am 0dad6a07: am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to ho 
* commit '983917288d1d6ea0ade9229740ea5bac0b8b2887':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-02 12:38:36 +00:00
Selim Cinek
e87d01ab23 am 6ebab792: am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '6ebab792d29d4a9d25a703c57b861e41dc8ee8df':
  Adapting translation length for a string in a dialog
 2014-10-02 02:00:37 +00:00
Selim Cinek
6ebab792d2 am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '1e5e35ef626d2a73cf823e75fcbb67af3398b1ff':
  Adapting translation length for a string in a dialog
 2014-10-02 00:58:46 +00:00
John Spurlock
eac9f30c94 am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit '4940789b6c821bcbc25330536fe76a3fdd7e7983':
  Doze: Route volume keys to music only while pulsing.
 2014-10-01 22:17:52 +00:00
Winson Chung
0dad6a0732 am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable th 
* commit 'd8ab73d71c50f8695ee8b671fdb838f2fd18790d':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-01 22:17:41 +00:00
John Spurlock
4940789b6c am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit 'c403a340cbb097a95b35b198b27cf44c80a7242e':
  Doze: Route volume keys to music only while pulsing.
 2014-10-01 20:23:39 +00:00
John Spurlock
c403a340cb Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 2014-10-01 20:17:36 +00:00
Winson Chung
d8ab73d71c am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode o 
* commit 'd092fc7076310fca5edd089df5bb5398096f6627':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-01 20:07:38 +00:00
Winson Chung
d092fc7076 Merge "Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option" into lmp-dev 2014-10-01 20:03:19 +00:00
John Spurlock
0b99ea94f0 Doze: Route volume keys to music only while pulsing. 
Avoid waking up the device on hw vol key presses during a doze
pulse.  Instead, behave as if the screen was off for these keys,
namely forwarding them over to the session manager.

Bug:17672775
Change-Id: I566b93f0bdea79253ac3eca41d3876b271c61306
 2014-10-01 15:32:22 -04:00
Winson Chung
9cb5c4e385 Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) 
- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
 2014-10-01 17:48:05 +00:00
Selim Cinek
1c061d4862 am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit 'cdbda3e989c640aade8c9164b12b51f452792c29':
  Adapting translation length for a string in a dialog
 2014-10-01 17:20:37 +00:00
Winson Chung
8dd27d9063 am be1b7ddb: am ac5bb347: am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'be1b7ddb44373b9373dcd1342d40fb02ef18238e':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:17:52 +00:00
John Spurlock
30fafedb84 am f35be105: am 9a4fc6aa: am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'f35be105ee104ee55caf44cfc914aa846d869ab8':
  Don't play hint animations when dozing
 2014-10-01 17:17:48 +00:00
Jason Monk
d26c9a4773 am e9250ae9: am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit 'e9250ae94f0a51bb174b4b51f91fb6a65205fb56':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:17:43 +00:00
John Spurlock
87a019b28b am c4b4ffb8: am abc4db31: am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'c4b4ffb808de03e8efcabd8cd96a192261baec0a':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 17:17:35 +00:00
Winson Chung
be1b7ddb44 am ac5bb347: am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'ac5bb347cb769f217135124ddb6008bab9727d22':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:09:22 +00:00
John Spurlock
f35be105ee am 9a4fc6aa: am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '9a4fc6aab9884af87d49e0d912da56dd8bfe8868':
  Don't play hint animations when dozing
 2014-10-01 17:09:18 +00:00
Jason Monk
e9250ae94f am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '81ab90f2173c8afac82a22c2cca72eb90293de9a':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:09:13 +00:00
John Spurlock
c4b4ffb808 am abc4db31: am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'abc4db312aa6e5287b5abbd2d201f10d642fca7d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 17:09:05 +00:00
Winson Chung
ac5bb347cb am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '3175f7d245daba660852cbcb92a7a821899b70a3':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:00:14 +00:00
John Spurlock
9a4fc6aab9 am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'eac6926f0cb260339ec7ec2495964331249338e2':
  Don't play hint animations when dozing
 2014-10-01 17:00:10 +00:00
Jason Monk
81ab90f217 am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:00:05 +00:00