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

153732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
dbc35f463b am 3e7c3c39: (-s ours) am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3e7c3c397bfd0f20db6719222218b349c3552e4d':
  Import translations. DO NOT MERGE
 2014-09-29 21:02:55 +00:00
Baligh Uddin
b5480f653f am d7304020: (-s ours) am 6744422b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd73040202084411199925419c6856406c8df10fe':
  Import translations. DO NOT MERGE
 2014-09-29 21:02:48 +00:00
Baligh Uddin
374b10b58b am 7e40778b: (-s ours) am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7e40778bae0c58173116fb7e6d250abfdb9b5250':
  Import translations. DO NOT MERGE
 2014-09-29 21:02:41 +00:00
Baligh Uddin
e037c0b1ad am 49b3a054: (-s ours) am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '49b3a054d1544f8fefc4ff01c7a4a70ba32aef54':
  Import translations. DO NOT MERGE
 2014-09-29 21:02:34 +00:00
Baligh Uddin
88539d1b29 am f94a7f80: (-s ours) am 5ce474d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f94a7f804ccadd60058617b86208d77345184da2':
  Import translations. DO NOT MERGE
 2014-09-29 21:02:27 +00:00
Baligh Uddin
972e17b79f am a2aec5d7: (-s ours) am 04678abb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a2aec5d7d2b76ebe6f9ab49f7bb876e0530d87a6':
  Import translations. DO NOT MERGE
 2014-09-29 21:02:06 +00:00
Baligh Uddin
0e22c773ab am e6012bb9: (-s ours) am b09aabfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e6012bb9200993a71734e12f82d9a351958f821d':
  Import translations. DO NOT MERGE
 2014-09-29 21:01:58 +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
Christoph Studer
35c7eedc9a am 0bb9d832: am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev 
* commit '0bb9d8327500c265c2efd82449db23421cd70d83':
  NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
 2014-09-29 21:01:43 +00:00
Adrian Roos
04cea9f8e0 am 0c92c858: am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev 
* commit '0c92c858b039a40b066136cdbf13ae5a38a00b1d':
  Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
 2014-09-29 21:01:37 +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
Paul Jensen
5aa788a61f am a621a97f: am 89e0f093: Move mobile provisioning APN support into telephony. 
* commit 'a621a97f4a05891a514ba5343c9db04d125e1eb8':
  Move mobile provisioning APN support into telephony.
 2014-09-29 21:01:08 +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
Baligh Uddin
3e7c3c397b am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e98a55e87e76dad4d5356438dd0068b874c87bab':
  Import translations. DO NOT MERGE
 2014-09-29 20:49:01 +00:00
Baligh Uddin
d730402020 am 6744422b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6744422b751cc277ae17020982c6d77a206979aa':
  Import translations. DO NOT MERGE
 2014-09-29 20:48:54 +00:00
Baligh Uddin
7e40778bae am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '37960312646de29b3271d9bc0d6a07cf4bbd942f':
  Import translations. DO NOT MERGE
 2014-09-29 20:48:48 +00:00
Baligh Uddin
49b3a054d1 am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c570fff11131e4407536e52e1742c0adb72b3b6f':
  Import translations. DO NOT MERGE
 2014-09-29 20:48:41 +00:00
Baligh Uddin
f94a7f804c am 5ce474d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5ce474d71e6104095dfcdce56fac56eedbf41199':
  Import translations. DO NOT MERGE
 2014-09-29 20:48:34 +00:00
Baligh Uddin
a2aec5d7d2 am 04678abb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '04678abbe56051871e83c63bf8328118c432e47c':
  Import translations. DO NOT MERGE
 2014-09-29 20:48:28 +00:00
Baligh Uddin
e6012bb920 am b09aabfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b09aabfd5f40f924e46d7ef635ba46e2a85dde20':
  Import translations. DO NOT MERGE
 2014-09-29 20:48:22 +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
Christoph Studer
0bb9d83275 am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev 
* commit 'f7c4509ffbbe6b1849c3ea61edac8d1d23906eaa':
  NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
 2014-09-29 20:48:08 +00:00
Adrian Roos
0c92c858b0 am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev 
* commit '51a400eb440c89fb06a47371bb7b026f00edb09c':
  Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
 2014-09-29 20:48:00 +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
Paul Jensen
a621a97f4a am 89e0f093: Move mobile provisioning APN support into telephony. 
* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
  Move mobile provisioning APN support into telephony.
 2014-09-29 20:47:32 +00: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
e98a55e87e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:10 +00:00
Baligh Uddin
6744422b75 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:09 +00:00
Baligh Uddin
3796031264 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:03 +00:00
Baligh Uddin
c570fff111 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:03 +00:00
Baligh Uddin
5ce474d71e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:58 +00:00
Baligh Uddin
04678abbe5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:58 +00:00
Baligh Uddin
b09aabfd5f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:54 +00:00
John Spurlock
e5238f7a8d Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 2014-09-29 16:28:52 +00:00
Christoph Studer
f7c4509ffb Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev 2014-09-29 16:13:29 +00:00
Christoph Studer
9ffa50096f NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI 
Bug: 17660485
Change-Id: I8684067538fcd2d43a9f95c6aa707b275b13ee40
 2014-09-29 18:08:26 +02:00
John Spurlock
bee3b0a023 DozeLog: Keep keyguard monitor alive, keep emer call stats. 
Ensure the existing keyguard callback survives weak reference
collection, and add missing emergency call stats append.

Bug:17496795
Change-Id: Iecec4646562cf1f6edb5bc5972767127f4419035
 2014-09-29 11:30:12 -04:00
Jorim Jaggi
8a63806a8d Revert "Add massive logging to investigate blank Keyguard" 
This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3.

Bug: 17475334
Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545
 2014-09-29 16:24:55 +02:00
Adrian Roos
51a400eb44 Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev 2014-09-29 13:49:40 +00:00
Adrian Roos
9d38f35a8f Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams 
By default, dreams should not get the in-window bars
because those conflict with the lights-out bar mode.

Bug: 17367264
Change-Id: I8c041c706f7a7c4791ed4760c34a5618fb7423d7
 2014-09-29 15:48:46 +02:00
Jorim Jaggi
79107083ca Merge "Add option to enable scrim SRC optimization" into lmp-dev 2014-09-29 13:44:07 +00:00
Jorim Jaggi
e2ff1a4edb Merge "Fix overdraw" into lmp-dev 2014-09-29 13:43:20 +00:00
Selim Cinek
311fc0b399 Fixed a crash that could occur in the ObservableScrollView 
Bug: 17644848
Change-Id: I771c27f9fee8c0d5edfbd21998ea015fd1d6f685
 2014-09-29 12:21:48 +00:00
Paul Jensen
89e0f0937a Move mobile provisioning APN support into telephony. 
Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.

bug:17324098

Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
 2014-09-29 11:37:43 +00:00
Jungshik Jang
49764d45f6 Merge "Apply new Android keycodes to CEC keycode mapping." into lmp-mr1-dev 2014-09-29 05:52:59 +00:00