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

124805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
5cf0595c17 am 5a2c6a21: (-s ours) am 6f71894b: am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '5a2c6a2110e3ad26336158bd6679eba4292009e6':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-07 03:02:53 +00:00
Leon Scroggins III
a9193553dd am 9d3f94b9: (-s ours) am 86176afd: am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '9d3f94b99b39c5748ba4a7e8198e5fcd9087414d':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-07 03:02:35 +00:00
Eric Laurent
a68b609047 am 33ac1218: am 6c506aac: am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '33ac1218b93cb4fcaba398fd73f27dcc72dfede3':
  Fix RemoteController synchronization mode
 2014-03-07 03:02:31 +00:00
Dianne Hackborn
470d50dab4 am ece7042d: (-s ours) am 01579953: am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit 'ece7042d7dc0e449fbcdb7698b31dee114042290':
  Fix issue #11536426 DO NOT MERGE
 2014-03-07 03:02:28 +00:00
Santos Cordon
eb7febbedf am 056d9ee4: (-s ours) am 61e385ac: am 59999040: am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '056d9ee45a8854441626e27a8ec3ad1339fb0728':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-07 03:02:26 +00:00
Filip Gruszczyński
9fd3fa160d am 311bc983: am 2f1b6851: am fb71862d: Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 
* commit '311bc98362d6944928865de414837bb73bbc7892':
  Setting pretty large divider distance for NumberPicker in clockwork.
 2014-03-07 02:55:27 +00:00
Baligh Uddin
7d42b895e6 am 3d207a2e: (-s ours) am 7f2a7372: (-s ours) am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '3d207a2e5713c0b59efdf03c6096e3c1cefdfa0a':
  Import translations. DO NOT MERGE
 2014-03-07 02:55:24 +00:00
Alan Viverette
858a0405ec Add icons for display adjustment quick settings 
BUG: 13028934
Change-Id: I437abc48ad34364995b37c504019f7a4871c8031
 2014-03-06 18:36:43 -08:00
John Reck
2228195452 Merge "Switch WebView to onDetachedFromWindowInternal" 2014-03-07 00:28:47 +00:00
John Reck
a88bdf8d46 Make sure we register functor count 
Bug: 13339664

Change-Id: Iafb8ba77bdf1d971c1d0a345ff525e7f7fa80352
 2014-03-06 16:22:47 -08:00
John Reck
34dbce14e8 Switch WebView to onDetachedFromWindowInternal 
Change-Id: I1036f48f3c98492421430c3894f937884fb4c63e
 2014-03-06 15:54:54 -08:00
Leon Scroggins III
5a2c6a2110 am 6f71894b: am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '6f71894b8c7f24c00f8963d3508afbd18f3f0910':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 22:56:33 +00:00
Leon Scroggins III
6f71894b8c am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit 'a4d7259c8246a07666f732b5e9fd12280b611d2e':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 22:45:26 +00:00
John Reck
b14dfe20ef Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()"" 
This reverts commit bac16fae7e6fceb1e516252ede673844b772e7c3.

Change-Id: I61e997b23fac1aa984129fdc0328426ff8891bdd
 2014-03-06 14:12:35 -08:00
Leon Scroggins III
a4d7259c82 am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 22:09:41 +00:00
Leon Scroggins III
9d3f94b99b am 86176afd: am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '86176afdeac9133b3b0caf2753a252167d1dad76':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 22:09:33 +00:00
Eric Laurent
33ac1218b9 am 6c506aac: am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '6c506aacb2015fd23487a4aa48cbb276ad40cc3a':
  Fix RemoteController synchronization mode
 2014-03-06 22:09:27 +00:00
Dianne Hackborn
ece7042d7d am 01579953: am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '01579953331b415c2ad1f04f91815d1f6eabe1e2':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 22:09:23 +00:00
Santos Cordon
056d9ee45a am 61e385ac: am 59999040: am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '61e385acf0e2c2296baf593b56ca3d4830bfaa02':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 22:09:20 +00:00
Leon Scroggins III
87e9e744ed am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 21:31:31 +00:00
Leon Scroggins III
86176afdea am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '337a200361482c046fb695f46b1052aa3c85db57':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 21:30:53 +00:00
Eric Laurent
6c506aacb2 am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '3260f254459fab42fb23389088da0eb73e0e0969':
  Fix RemoteController synchronization mode
 2014-03-06 21:30:49 +00:00
Dianne Hackborn
0157995333 am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '76e1d76948c68f9414a9ca0271ea9dfb6da40191':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 21:30:47 +00:00
Santos Cordon
61e385acf0 am 59999040: am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '5999904094865f27febb7588f1a40b5561ef8d4b':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 21:30:45 +00:00
Bart Sears
acbc41d656 Merge "Revert "Workaround apps not calling super.onDetachedFromWindow()"" 2014-03-06 21:10:06 +00:00
Bart Sears
bac16fae7e Revert "Workaround apps not calling super.onDetachedFromWindow()" 
Requested by jreck to fix the build.

This reverts commit 198d20842a537f3df3584ea084e74220e172b086.

Change-Id: I733065cc124b59bf914034f5bac5e2e951a5b604
 2014-03-06 21:09:51 +00:00
Filip Gruszczyński
311bc98362 am 2f1b6851: am fb71862d: Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 
* commit '2f1b685154ef178a1e5932f252025a67aec9c1f1':
  Setting pretty large divider distance for NumberPicker in clockwork.
 2014-03-06 21:02:40 +00:00
Leon Scroggins III
92a3283286 DO NOT MERGE - Fix Javadoc build break. 
Remove links to non-specific function name.

Bug: 13246311

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
 2014-03-06 20:44:16 +00:00
John Reck
d621e77c8d Merge "Workaround apps not calling super.onDetachedFromWindow()" 2014-03-06 20:42:52 +00:00
John Reck
198d20842a Workaround apps not calling super.onDetachedFromWindow() 
Bug: 13338698
 Move the releasing of hardware resources to a new
 @hide onDetachedFromWindowInternal

Change-Id: I52b4e6ba4d5b3ce20b89cabffa248d1d780e3e81
 2014-03-06 12:40:49 -08:00
Leon Scroggins III
337a200361 am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '8d3281f5f7a880b996e50d291ebb7154a486eb6c':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 20:06:14 +00:00
Eric Laurent
3260f25445 am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
  Fix RemoteController synchronization mode
 2014-03-06 20:06:08 +00:00
Dianne Hackborn
76e1d76948 am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '12caef7836a21fa20d052e4868df92e23b930cf6':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 20:06:05 +00:00
Santos Cordon
5999904094 am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit 'abbd963e3c50f5241f9bf668b8b806c42a202621':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 20:06:02 +00:00
Baligh Uddin
3d207a2e57 am 7f2a7372: (-s ours) am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7f2a7372850cc812873b5466cf4cbe7afceb8873':
  Import translations. DO NOT MERGE
 2014-03-06 19:59:46 +00:00
Filip Gruszczyński
2f1b685154 am fb71862d: Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 
* commit 'fb71862d31781581f3b6dbb043efb116f03876c8':
  Setting pretty large divider distance for NumberPicker in clockwork.
 2014-03-06 19:54:11 +00:00
Leon Scroggins III
8d3281f5f7 am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit 'ee008d4264a95bba5f90b17856fc06fa29a6f12c':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 19:49:58 +00:00
Eric Laurent
eac19754ca am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '617e715a40e2867c0b30d1bae38c20815ee30071':
  Fix RemoteController synchronization mode
 2014-03-06 19:49:55 +00:00
Dianne Hackborn
12caef7836 am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '71ab245a0d7830791cb89ec9130313620a1ee029':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 19:49:52 +00:00
Santos Cordon
abbd963e3c am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 19:49:46 +00:00
Filip Gruszczyński
fb71862d31 Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 2014-03-06 19:43:39 +00:00
Baligh Uddin
7f2a737285 am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c7a535c552f8853076ba104e7948f7c1d324d47a':
  Import translations. DO NOT MERGE
 2014-03-06 19:40:40 +00:00
Leon Scroggins III
ee008d4264 Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 2014-03-06 19:37:28 +00:00
Eric Laurent
617e715a40 Merge "Fix RemoteController synchronization mode" into klp-dev 2014-03-06 19:21:26 +00:00
Filip Gruszczyński
fbd60cfdfb Setting pretty large divider distance for NumberPicker in clockwork. 
This is required because NumberPicker code calculated the click action based
on the divider distance and only counts clicks withing these bounds.

Change-Id: I24d7d498c1a9c023fb6a3488a5b90afd6b6f7597
 2014-03-06 11:03:01 -08:00
Baligh Uddin
c7a535c552 am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd010cf12c796cf83c760df037916e5572ce55868':
  Import translations. DO NOT MERGE
 2014-03-06 18:44:45 +00:00
Dianne Hackborn
71ab245a0d Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 2014-03-06 18:29:19 +00:00
Jeff Davidson
16340670af Merge "Add a warning about the SSID format in CaptivePortalTracker." 2014-03-06 18:22:07 +00:00
Chris Craik
b7d0cfa0d8 Merge "Add Path.isConvex, and force View outlines to be convex" 2014-03-06 18:18:59 +00:00
Dianne Hackborn
76c59a89e9 Fix issue #11536426 DO NOT MERGE 
Permission denied when trying to launch an activity from a notification

We don't remove pending intents when updating an app, which is necessary
to keep app widgets and other things working.  However, when uninstalling
an app, we should clear out all of its pending intents.

Change-Id: I95067b31098115b5a7b127766fd093750063bbb8
 2014-03-06 10:12:57 -08:00