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

160921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jungshik Jang
b4bd69d307 am eb6724d5: am 73483b6b: Support parameterized keycode in cec. 
* commit 'eb6724d530160e802c0209b2f0bcfafa540d294e':
  Support parameterized keycode in cec.
 2014-09-30 14:57:06 +00:00
Derek Sollenberger
713e0683ae am 345effc2: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-mr1-dev 
* commit '345effc2b20a01a892acb4752d8e0c84d8a6ba7d':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-30 14:53:02 +00:00
Jungshik Jang
61ee8979de am 8dff3698: Merge "Update CEC keycode repeat status." into lmp-mr1-dev 
* commit '8dff3698382aac911a4f1cbae549164c9c714ebf':
  Update CEC keycode repeat status.
 2014-09-30 14:52:59 +00:00
Stuart Scott
a541338a1e am ec89863a: am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev 
* commit 'ec89863adec09dbf980b2d2c90c0fa5e78ffa7a9':
  Get the MCC/MNC using defaults.
 2014-09-30 14:52:56 +00:00
Deepanshu Gupta
52ac4033ec am 4b1cfef5: am 22c8a434: am 052c4c4b: Merge "Update time in layout preview" into lmp-dev 
* commit '4b1cfef5e23ed28790f669fc39679435fd003947':
  Update time in layout preview
 2014-09-30 14:52:55 +00:00
John Spurlock
f2faae228e am eeac1f1d: am cbb732a8: am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev 
* commit 'eeac1f1df96c049125de1bb231106acac0b9019d':
  Zen: Fix downtime calculation for Sunday mornings.
 2014-09-30 14:52:55 +00:00
Alan Viverette
f6facc871d am 8f3fdc24: am 5f5255c4: am 1e6775eb: Merge "Update alert dialog message text style, list divider opacity" into lmp-dev 
* commit '8f3fdc24c70b3e64e7f865ae6f1fab957e3a036c':
  Update alert dialog message text style, list divider opacity
 2014-09-30 14:52:54 +00:00
Brian Carlstrom
5458b3ab14 am 048d7521: am 954ffe6e: am 0824da26: Add string for no boot.art notification 
* commit '048d75210a662da21a6e7de8e3d20c0321e1de4c':
  Add string for no boot.art notification
 2014-09-30 14:52:54 +00:00
Jorim Jaggi
4b5bd7292a am 4fda5644: am 88126aa1: am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev 
* commit '4fda5644565d01605f9ae6a184eff0c696095914':
  Revert "Add massive logging to investigate blank Keyguard"
 2014-09-30 14:52:53 +00:00
Baligh Uddin
92eb0515c2 am dbc35f46: (-s ours) am 3e7c3c39: (-s ours) am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'dbc35f463b0375d4bc0c732b052452354a5c37d9':
  Import translations. DO NOT MERGE
 2014-09-30 14:52:53 +00:00
Baligh Uddin
5c06e7d43f am b5480f65: (-s ours) am d7304020: (-s ours) am 6744422b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b5480f653fc8242a36053709b5cea570358518e6':
  Import translations. DO NOT MERGE
 2014-09-30 14:52:53 +00:00
Baligh Uddin
e30210cc54 am 374b10b5: (-s ours) am 7e40778b: (-s ours) am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '374b10b58b7586689880cfd64342d1160d3a3532':
  Import translations. DO NOT MERGE
 2014-09-30 14:52:52 +00:00
Baligh Uddin
e76413b0f7 am e037c0b1: (-s ours) am 49b3a054: (-s ours) am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e037c0b1ad9bb82fd069bd09fe9582864d922466':
  Import translations. DO NOT MERGE
 2014-09-30 14:52:52 +00:00
Baligh Uddin
0c2afed484 am 88539d1b: (-s ours) am f94a7f80: (-s ours) am 5ce474d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '88539d1b298052e0b14c4fb815e208186c861159':
  Import translations. DO NOT MERGE
 2014-09-30 14:52:52 +00:00
Baligh Uddin
78a9022868 am 972e17b7: (-s ours) am a2aec5d7: (-s ours) am 04678abb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '972e17b79f9aebdb2ea253bb576d29134814ea5f':
  Import translations. DO NOT MERGE
 2014-09-30 14:52:52 +00:00
Baligh Uddin
200e2bcf7d am 0e22c773: (-s ours) am e6012bb9: (-s ours) am b09aabfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '0e22c773abff0ffeb078a6702c5982a0b8cb1684':
  Import translations. DO NOT MERGE
 2014-09-30 14:52:51 +00:00
John Spurlock
c2c317aa53 am d990706b: am 0bea7286: am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 
* commit 'd990706b03f0aad5cfc4ef102d1cf2ce92560dd1':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.
 2014-09-30 14:52:51 +00:00
Christoph Studer
7080a5f68e am 35c7eedc: am 0bb9d832: am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev 
* commit '35c7eedc9a42ee840e7f2e4571179c240f508040':
  NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
 2014-09-30 14:52:50 +00:00
Adrian Roos
a0ce5e72eb am 04cea9f8: am 0c92c858: am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev 
* commit '04cea9f8e075e9d6fb7c92b8170771cf78005e29':
  Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
 2014-09-30 14:52:50 +00:00
Jorim Jaggi
1bde0f0e69 am c0350c7c: am 5b002995: am 79107083: Merge "Add option to enable scrim SRC optimization" into lmp-dev 
* commit 'c0350c7c00131c4c1358f4a84d8cc8ba73db9114':
  Add option to enable scrim SRC optimization
 2014-09-30 14:52:49 +00:00
Jorim Jaggi
fc133d0934 am b0c3726a: am 697ace4e: am e2ff1a4e: Merge "Fix overdraw" into lmp-dev 
* commit 'b0c3726a3b7a4ef4890c3b414feea69cec6d6818':
  Fix overdraw
 2014-09-30 14:52:48 +00:00
Selim Cinek
9e7b6c045d am f2a6160b: am 6b44ae6e: am 311fc0b3: Fixed a crash that could occur in the ObservableScrollView 
* commit 'f2a6160b924c7d8073c55eaf33e728c7336a4a90':
  Fixed a crash that could occur in the ObservableScrollView
 2014-09-30 14:52:48 +00:00
Paul Jensen
52786d9bc1 am 5aa788a6: am a621a97f: am 89e0f093: Move mobile provisioning APN support into telephony. 
* commit '5aa788a61f0613966bd1e866714927b57468bffa':
  Move mobile provisioning APN support into telephony.
 2014-09-30 14:52:47 +00:00
Jungshik Jang
123f496b8b am 49764d45: Merge "Apply new Android keycodes to CEC keycode mapping." into lmp-mr1-dev 
* commit '49764d45f63955374803a4a1e092ee18bb33b1a5':
  Apply new Android keycodes to CEC keycode mapping.
 2014-09-30 14:52:47 +00:00
jgu21
ae9a132a95 am 454a681f: am df44f764: am 20867871: Frameworks/base: Early init native bridge 
* commit '454a681fc3225ee989ff85c000e7435ed2b3ced9':
  Frameworks/base: Early init native bridge
 2014-09-30 14:52:46 +00:00
George Mount
3cc3fbf3aa am 2d0d041f: am 3bcfbdd9: am 8120652b: Order GhostViews so that they display in their ghosted view\'s order. 
* commit '2d0d041ffe663db6e28fbf8fc30c78b6e216ce25':
  Order GhostViews so that they display in their ghosted view's order.
 2014-09-30 14:52:45 +00:00
Svetoslav
7288d98990 am 903365a9: am 59bb49fb: am 922fcc2f: Merge "Crash in print spooler if save to PDF selected early." into lmp-dev 
* commit '903365a90100930fd33c9ee6b5ff4f416d36c84a':
  Crash in print spooler if save to PDF selected early.
 2014-09-30 14:52:45 +00:00
Svetoslav
1662a9b9ad am 90f2f122: am 1fd73590: am b179bed3: Merge "Fix carsh in print spooler if custom print setings return bad pages." into lmp-dev 
* commit '90f2f122865e7334a76363829c01c34d805a9433':
  Fix carsh in print spooler if custom print setings return bad pages.
 2014-09-30 14:52:44 +00:00
Svetoslav
6b0394fb95 am 77e41f5e: am b009016f: am ed2fdc6e: Accessibility node provider getting invalid virtual view id. 
* commit '77e41f5ec4a5e5225e066823fb9e8afa0f26c244':
  Accessibility node provider getting invalid virtual view id.
 2014-09-30 14:52:44 +00:00
Jungshik Jang
eb6724d530 am 73483b6b: Support parameterized keycode in cec. 
* commit '73483b6bc9046cbb7a54748c31ee724358a631ef':
  Support parameterized keycode in cec.
 2014-09-30 14:52:43 +00:00
Derek Sollenberger
345effc2b2 Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-mr1-dev 2014-09-30 14:34:58 +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
415c64b60d Import translations. DO NOT MERGE 
Change-Id: Ibf7c0b27ceae6f07a7f0e38e0fae2e83d218051c
Auto-generated-cl: translation import
 2014-09-30 04:05:35 -07:00
Baligh Uddin
434e3f5692 Import translations. DO NOT MERGE 
Change-Id: I7312c543254668cb3b572767fe94a3d8736b04f3
Auto-generated-cl: translation import
 2014-09-30 01:20:57 -07:00
Baligh Uddin
a2de3cf2f6 Import translations. DO NOT MERGE 
Change-Id: I7005f47b8d90cf03a93a92ccbf91f0e363bdd65c
Auto-generated-cl: translation import
 2014-09-30 01:10:50 -07:00
Baligh Uddin
38c6643e8e Import translations. DO NOT MERGE 
Change-Id: Iab979f7e50308c63085496805282145f2788489c
Auto-generated-cl: translation import
 2014-09-30 01:00:26 -07:00
Jungshik Jang
8dff369838 Merge "Update CEC keycode repeat status." into lmp-mr1-dev 2014-09-30 04:47:56 +00:00
Matthew Williams
bc156ba430 Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 2014-09-30 03:09:10 +00:00
Lorenzo Colitti
d8f7e04828 Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 2014-09-30 03:05:49 +00:00
Dianne Hackborn
fb3809ca63 Fix issue #17705755: Battery stats resets at incorrect times 
Revert back to (mostly) KK behavior, fix a problem where we were
collecting some data in an inconsistent state.

Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02
 2014-09-29 18:31:22 -07:00
Scott Rowe
d1462247e0 am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '6287a65cca1d7efb8a265be5b51feca0f1e320f7':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-30 00:53:34 +00:00
Ricardo Cervera
3910b5d2f5 am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '6ea34ddfde0aa3c60a83cc4fb7111514be97da9c':
  docs: Fixed path for build output.
 2014-09-30 00:53:23 +00:00
Justin Koh
91bd876991 am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '92ffd6b5fe11c649483c1ae53ec72a42d33629dd':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-09-30 00:53:19 +00:00
Alan Viverette
76e15c4b3a Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 2014-09-30 00:50:39 +00:00
Alan Viverette
b6ca2050c3 Decrease date picker height to avoid cutting off calendar 
BUG: 17696098
Change-Id: I3d97d8bcd5222bf266dfc75e89759d57ec184515
 2014-09-29 17:47:03 -07:00
Scott Rowe
6287a65cca am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '294d534787e139119d30eb7a5b4dd1532312018e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-30 00:39:49 +00:00
Ricardo Cervera
6ea34ddfde am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '9f48394158bce2984a19fe504b7a7f1f673866f3':
  docs: Fixed path for build output.
 2014-09-30 00:39:39 +00:00
Justin Koh
92ffd6b5fe am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-09-30 00:39:16 +00:00
Alan Viverette
b805da9b59 Merge "Fix drawable container tinting" into lmp-dev 2014-09-30 00:32:30 +00:00