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

6902 Commits

Author SHA1 Message Date
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
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
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
Selim Cinek
cdbda3e989 am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '15b2202bacdfcc249d7f51bcd3361e6694d24267':
  Adapting translation length for a string in a dialog
 2014-10-01 16:57:09 +00:00
Selim Cinek
15b2202bac Merge "Adapting translation length for a string in a dialog" into lmp-dev 2014-10-01 16:43:07 +00:00
Baligh Uddin
4aa820ce58 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 16:35:19 +00:00
Baligh Uddin
e575c819e5 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-01 16:35:15 +00:00
Baligh Uddin
ff99ff98cc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 16:35:13 +00:00
Winson Chung
3175f7d245 am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '2396f135678e8a40b963904e8a6710bc6a204180':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 15:14:34 +00:00
John Spurlock
eac6926f0c am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
  Don't play hint animations when dozing
 2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '15349991240bb9443d704b4ac85915f474e5108c':
  Pull roaming from mServiceState for consistency
 2014-10-01 15:14:26 +00:00
John Spurlock
3fd4440fea am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'af41d8477a8152c0597630066207a863ad74614e':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 15:14:18 +00:00
Winson Chung
2396f13567 am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 14:59:12 +00:00
John Spurlock
260e6d542f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
 2014-10-01 14:59:07 +00:00
Jason Monk
1534999124 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
 2014-10-01 14:58:57 +00:00
John Spurlock
af41d8477a am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 14:58:45 +00:00
Selim Cinek
1aca1d4110 Adapting translation length for a string in a dialog 
Bug: 17344905
Change-Id: Id95bdfea30c8ffd86a44cfa259cf5417abb09528
 2014-10-01 14:12:11 +02:00
Winson Chung
e3206407a5 Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 2014-09-30 16:39:43 +00:00
John Spurlock
a1b84165f9 Merge "Don't play hint animations when dozing" into lmp-dev 2014-09-30 16:35:26 +00:00
Jorim Jaggi
d7912d2f10 Don't play hint animations when dozing 
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
 2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab Merge "Pull roaming from mServiceState for consistency" into lmp-dev 2014-09-30 15:30:11 +00:00
John Spurlock
ee98df79a1 Doze: Log screenOnFromTouch when flinging. 
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
 2014-09-30 14:07:23 +00:00
Jason Monk
1cd44e3ab4 Pull roaming from mServiceState for consistency 
Also consolidate roaming logic while here, to make it easier to
maintain.

Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
 2014-09-30 10:05:46 -04:00
Baligh Uddin
079d682d07 Import translations. DO NOT MERGE 
Change-Id: I5b0a638907398f87246ee480b5f7683382d834ca
Auto-generated-cl: translation import
 2014-09-30 04:08:15 -07:00
Baligh Uddin
263f3f2505 Import translations. DO NOT MERGE 
Change-Id: I5d014bb505bd408fa40c0f30e6e28623e3006d5c
Auto-generated-cl: translation import
 2014-09-30 04:02:54 -07:00
Baligh Uddin
3fd0438f55 Import translations. DO NOT MERGE 
Change-Id: Ic6eb721869643c210f5e3e89fb407a346d27ffd2
Auto-generated-cl: translation import
 2014-09-30 04:00:07 -07:00
Jorim Jaggi
4fda564456 am 88126aa1: am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 
* commit '88126aa1707e38af0b70cb8b9752917f9589cb88':
  Revert "Add massive logging to investigate blank Keyguard"
 2014-09-29 21:03:02 +00:00
John Spurlock
d990706b03 am 0bea7286: am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 
* commit '0bea72864e1129ef559744ab00e74b6215ef246c':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.
 2014-09-29 21:01:50 +00:00
Jorim Jaggi
c0350c7c00 am 5b002995: am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev 
* commit '5b002995ad5bda15fc7456228789b6b94ae2522c':
  Add option to enable scrim SRC optimization
 2014-09-29 21:01:30 +00:00
Jorim Jaggi
b0c3726a3b am 697ace4e: am e2ff1a4e: Merge "Fix overdraw" into lmp-dev 
* commit '697ace4edd1f1bf28dd0c058f53ad7af5858f2c8':
  Fix overdraw
 2014-09-29 21:01:22 +00:00
Selim Cinek
f2a6160b92 am 6b44ae6e: am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView 
* commit '6b44ae6e921ec6030274b96e88c6e5746c74d6c2':
  Fixed a crash that could occur in the ObservableScrollView
 2014-09-29 21:01:15 +00:00
Jorim Jaggi
88126aa170 am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 
* commit 'b5140130839e70f1fb55a0bc81b11354b42b820b':
  Revert "Add massive logging to investigate blank Keyguard"
 2014-09-29 20:49:08 +00:00
John Spurlock
0bea72864e am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 
* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.
 2014-09-29 20:48:15 +00:00
Jorim Jaggi
5b002995ad am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev 
* commit '79107083ca50b99c9e7b678d7739b9ab4798db0f':
  Add option to enable scrim SRC optimization
 2014-09-29 20:47:53 +00:00
Jorim Jaggi
697ace4edd am e2ff1a4e: Merge "Fix overdraw" into lmp-dev 
* commit 'e2ff1a4edbe5c8eeb2610a62b8cfe7a58d4c8150':
  Fix overdraw
 2014-09-29 20:47:46 +00:00
Selim Cinek
6b44ae6e92 am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView 
* commit '311fc0b399f01a79169ae69aea05556043a7d7df':
  Fixed a crash that could occur in the ObservableScrollView
 2014-09-29 20:47:39 +00:00
Winson Chung
8bf05afc26 Fixing crash in Recents due to late onBootCompleted call (Bug 17572254) 
Change-Id: I016dd8b7be9efa786291051152b1b56aac708e33
 2014-09-29 13:42:49 -07:00
Jorim Jaggi
b514013083 Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 2014-09-29 16:31:55 +00:00
Baligh Uddin
04678abbe5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:58 +00:00