Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
6a7a24cc5a am 88cfb428: Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev 
automerge: d305bf3

* commit 'd305bf3dff7dcb1084aab5777818b4d96975268d':
  Tidy up unused hidden methods in LauncherApps
 2014-10-31 12:57:46 +00:00
Kenny Guy
d305bf3dff am 88cfb428: Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev 
* commit '88cfb428d4e9ad4a45d829795d5bdce3a0d4c62c':
  Tidy up unused hidden methods in LauncherApps
 2014-10-31 12:53:31 +00:00
Kenny Guy
88cfb428d4 Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev 2014-10-31 12:47:38 +00:00
Nicolas Prevot
c4fc00a58d Do not fix uris inside the system. 
When we fix uris by adding the user id they belong to, the extras
of the intent are unpacked and repacked. This must not happen
inside the system process. It happened when ResolverActivity was
handling an activity intent coming from a different user.

BUG:18198630

Change-Id: I869897013bb2e5522584b404e87a8f20e7943b60
 2014-10-31 12:40:11 +00:00
Ignacio Solla
c418f07993 [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting. 
BUG:18152150

Change-Id: Id5c788bc766d7c45c3f9c96837d5b2824a601f9e
 2014-10-31 12:06:14 +00:00
Selim Cinek
1b7f51ebc6 Fixed a crash in the Notification expandHelper 
Bug: 18004384
Change-Id: I3b8e60041c527689722591962f384ea91f4a954a
 2014-10-31 12:37:43 +01:00
Selim Cinek
3a9c10a286 Fixed a bug when tapping in the empty space of the notification panel 
This happens often when tapping in the dismissView area.
Also fixed a bug where the decor views and the speedbump where swipable.

Bug: 18031244
Change-Id: I2c9685e068420c21032affb3aa58f7d53183ff52
 2014-10-31 12:37:43 +01:00
Kenny Guy
dd6cb55b0e Tidy up unused hidden methods in LauncherApps 
Bug: 17483329
Change-Id: Ic4fbb180bafaa4d2c5ba332fe228c3d9baf4761c
 2014-10-31 11:23:12 +00:00
Sander Alewijnse
fc3ddf1107 am a1ceb929: am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit 'a1ceb92964612fca32bcd83e07b26e72994afca2':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:26:03 +00:00
Sander Alewijnse
a1ceb92964 am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:20:08 +00:00
Sander Alewijnse
94efda638e am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit 'a0edff4e94bcf0f1fd8c7d32bb8747e868ba314a':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:11:56 +00:00
Sander Alewijnse
a0edff4e94 Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 2014-10-31 10:05:36 +00:00
Mark Renouf
01afc37403 If no display settings are matched, return the first one. DO NOT MERGE 
automerge: cf0f740  -s ours

* commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 09:21:12 +00:00
Joe Fernandez
43fda072c2 am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
* commit '922e6b6aae0c19b31073e925da7fc813ed54bd4c':
  docs:studio-update-814
 2014-10-31 05:25:48 +00:00
Joe Fernandez
922e6b6aae am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
* commit '81fcc85c23eea3905238f3f8d359df0344c37865':
  docs:studio-update-814
 2014-10-31 05:21:22 +00:00
Joe Fernandez
81fcc85c23 Merge "docs:studio-update-814" into lmp-docs 2014-10-31 05:18:43 +00:00
Erik Kline
8e3f4fbdf6 Remove CONNECTIVITY_CHANGE_DELAY and friends. 
Once optimistic addresses become useable upon kernel notification
there will be no need for a connectivity delay.

This change requires kernel changes like:
    https://android-review.googlesource.com/#/c/109934

Bug: 17769720
Change-Id: I8510c540aa655aad6a82ee322d591331357ee272
 2014-10-31 14:07:33 +09:00
Tyler Gunn
5754ea5a13 am 23c7b8f1: Merge "Creating connections for conference event package participants." into lmp-mr1-dev automerge: 450f904 automerge: 2257fe8 
* commit '23c7b8f16f8056edfd6328a539b265c90b1f1853':
  Creating connections for conference event package participants.
 2014-10-31 03:49:20 +00:00
Yohei Yukawa
59dd62d5d0 am 7cbd9301: Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev automerge: ba910df automerge: d3f5127 
* commit '7cbd93016b65febf829468b6981f343414ef0da2':
  Fix not to show a log with empty default ime
 2014-10-31 03:49:16 +00:00
Tyler Gunn
23c7b8f16f Merge "Creating connections for conference event package participants." into lmp-mr1-dev automerge: 450f904 
automerge: 2257fe8

* commit '2257fe8a7597c3a0133514691ac872c2b6ac3dc5':
  Creating connections for conference event package participants.
 2014-10-31 03:39:32 +00:00
Yohei Yukawa
7cbd93016b Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev automerge: ba910df 
automerge: d3f5127

* commit 'd3f51271f5c7f5a09c8ee1bce1ea358b0c27629c':
  Fix not to show a log with empty default ime
 2014-10-31 03:38:40 +00:00
Tyler Gunn
2257fe8a75 Merge "Creating connections for conference event package participants." into lmp-mr1-dev 
automerge: 450f904

* commit '450f9047ce716ac7b08583436922ad3948f909f1':
  Creating connections for conference event package participants.
 2014-10-31 03:36:39 +00:00
Yohei Yukawa
d3f51271f5 Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev 
automerge: ba910df

* commit 'ba910dfaddb2e2926c9c52fbc6ca3f2f8cf1028b':
  Fix not to show a log with empty default ime
 2014-10-31 03:35:40 +00:00
Mark Renouf
2182bf5ac8 am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit '3d875f804018ebd48189633bb48ad6083c953eed':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 03:22:07 +00:00
Tyler Gunn
450f9047ce Merge "Creating connections for conference event package participants." into lmp-mr1-dev 2014-10-31 03:16:09 +00:00
Mark Renouf
3d875f8040 am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE 
* commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-10-31 03:13:21 +00:00
Yohei Yukawa
ba910dfadd Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev 2014-10-31 03:09:05 +00:00
Adam Powell
5dd072d884 Allow swipe down to dismiss for ResolverDrawerLayout 
Let the user swipe the intent resolver UI off of the screen to get rid
of it. So satisfying!

Also fix a bug where transitioning between touching the area outside
of the drawer to the drawer itself would misbehave or otherwise
dismiss when it shouldn't.

Bug 18026675

Change-Id: I456cc22b9575dc4c65e45154dc81201fe2045adc
 2014-10-30 19:51:41 -07:00
Mark Renouf
cf0f740e39 If no display settings are matched, return the first one. DO NOT MERGE 
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.

BUG: 18130296
BUG: 18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
 2014-10-30 21:42:11 -04:00
Alan Viverette
e7bcb1790a am e0e16794: am 19745dc0: am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 
* commit 'e0e16794afa38e00cdd5e0a9c2bd25700b77e15b':
  Only draw AbsListView selector when focused or pressed
 2014-10-31 00:43:42 +00:00
George Mount
6ced4faf69 am 104257ba: am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit '104257bac6dfd677a2f0a36467d5a42eef27e597':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:43:37 +00:00
Alan Viverette
7bec21e627 am 1dfcd0cc: am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit '1dfcd0cc96d0cf50d81fe71101389a30e2bdbf2c':
  Fix inset check in ThreadedRenderer
 2014-10-31 00:43:33 +00:00
Alan Viverette
e0e16794af am 19745dc0: am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 
* commit '19745dc0f1686dbcadd0107a18e4336ce2de2729':
  Only draw AbsListView selector when focused or pressed
 2014-10-31 00:38:56 +00:00
George Mount
104257bac6 am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:38:48 +00:00
Alan Viverette
1dfcd0cc96 am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit 'e1f9f2311035177a91dd568c7ec9a821a76b9e24':
  Fix inset check in ThreadedRenderer
 2014-10-31 00:38:39 +00:00
Craig Mautner
585b0c3dc1 am 6a80527f: am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '6a80527f617e603b3c4931ce88c7804d570de501':
  Add enter-animation-done callback for system windows
 2014-10-31 00:37:01 +00:00
Alan Viverette
5b0c065798 am b65a27da: am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'b65a27da39b53019f626bc9a380f0cad7e363bb8':
  Remove scroll view from correct parent in AlertController
 2014-10-31 00:36:54 +00:00
Guang Zhu
a74e6185c3 am 3ef0189a: am 3a68e181: am 4ba4e03e: Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 
* commit '3ef0189a821cf3d76003584778025850249c1e55':
  also add backtraces of CPUs before watchdog kills system server
 2014-10-31 00:36:50 +00:00
Santos Cordon
a74172d409 am 523271de: am 52e34e6a: am c1c86151: Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 
* commit '523271dee777945387ad9f011724cd072928a7b4':
  More updates to javadocs for Telecom APIs.
 2014-10-31 00:36:45 +00:00
Santos Cordon
ae1f94f3b6 am b99e154a: am 3ae9505f: am 9acb9598: Merge "Even more javadocs for telecom." into lmp-mr1-dev 
* commit 'b99e154ac2b44a546b43ce08b56026f4db37035c':
  Even more javadocs for telecom.
 2014-10-31 00:36:41 +00:00
Selim Cinek
903e7dc0df am 47278983: am db885e22: am a68da938: Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 
* commit '47278983d96146d6e700cda457b8e5802cf441f6':
  Fixed a bug with notification clipping
 2014-10-31 00:36:37 +00:00
John Spurlock
57177c75ea am 68fdbd01: am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit '68fdbd01798dad380581d02c5b9d229aecb10ef0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:36:32 +00:00
Alan Viverette
613d43473e am 71c27899: am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit '71c2789930de7fb1b98ad10ea6a5e6f23500ead2':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-31 00:36:28 +00:00
Rich Slogar
96b245acf0 docs:studio-update-814 
Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
 2014-10-30 17:31:33 -07:00
Craig Mautner
6a80527f61 am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
  Add enter-animation-done callback for system windows
 2014-10-31 00:29:52 +00:00
Alan Viverette
b65a27da39 am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'd93421b1438607f7656c7b65163c6681526693b0':
  Remove scroll view from correct parent in AlertController
 2014-10-31 00:29:29 +00:00
Guang Zhu
3ef0189a82 am 3a68e181: am 4ba4e03e: Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 
* commit '3a68e1811f8d374fec04e75e34a89042ca9d1862':
  also add backtraces of CPUs before watchdog kills system server
 2014-10-31 00:29:22 +00:00
Santos Cordon
523271dee7 am 52e34e6a: am c1c86151: Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 
* commit '52e34e6a623095f00629af09e89889fd34ae6e0a':
  More updates to javadocs for Telecom APIs.
 2014-10-31 00:29:09 +00:00
Santos Cordon
b99e154ac2 am 3ae9505f: am 9acb9598: Merge "Even more javadocs for telecom." into lmp-mr1-dev 
* commit '3ae9505f67b24fd29388d2ab0666086e81db6fce':
  Even more javadocs for telecom.
 2014-10-31 00:28:58 +00:00
Selim Cinek
47278983d9 am db885e22: am a68da938: Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 
* commit 'db885e22bd518fef27a339efddff8b3484610b53':
  Fixed a bug with notification clipping
 2014-10-31 00:28:40 +00:00