Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,636 Commits 3 Branches 0 Tags
b35522f77d0d3d5ed2090214c776c476c8fc76cc
Commit Graph

49637 Commits

Author SHA1 Message Date
Aravind Akella
b35522f77d am fce3bc83: am 32207e3c: Merge "Changes to Data Injection mode APIs" into mnc-dev 
* commit 'fce3bc838f0db1122fee563b14d1c7c7b7d46a9f':
  Changes to Data Injection mode APIs
 2015-07-02 00:59:02 +00:00
Robert Schaub
ac00050c72 am 31a084ad: am a5097999: am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 
* commit '31a084adf8a234d42c41340610be4c46af229a03':
  docs: Changed link in Java source code comment to repair 404
 2015-07-02 00:36:10 +00:00
Filip Gruszczynski
2b5a6842fd am cc7fa77e: am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev 
* commit 'cc7fa77e25e63b79a827816b7eea37bacedf5bff':
  Calculate outset hint when adding window.
 2015-07-01 22:06:05 +00:00
John Reck
9bccbf84e9 am 20ff6cd2: am a4ac386d: Merge "Make querying the graphics stats service more defensive" into mnc-dev 
* commit '20ff6cd2581a6850b4df5939f96e394a898461be':
  Make querying the graphics stats service more defensive
 2015-07-01 22:05:58 +00:00
Aravind Akella
32207e3c66 Merge "Changes to Data Injection mode APIs" into mnc-dev 2015-07-01 17:39:57 +00:00
Robert Schaub
a50979997c am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 
* commit 'e51d6d05e9334fce5d46909ea669027762c4c0a2':
  docs: Changed link in Java source code comment to repair 404
 2015-07-01 17:12:31 +00:00
Paul Jensen
5973eb4822 am bf816248: am e51c46b0: Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev 
* commit 'bf816248590f540cc8dda5d211518d676d43a725':
  Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API
 2015-07-01 17:12:14 +00:00
George Mount
b7d4fd96b9 am 0ace7cb1: am cb23ec41: Merge "Add missing addPauseListener." into mnc-dev 
* commit '0ace7cb1815f35acff37e68c03de74571a52cf03':
  Add missing addPauseListener.
 2015-07-01 17:12:08 +00:00
Chris Banes
a50db6c626 am c9812040: am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 
* commit 'c9812040941dad43ca0892bd4dd5e8cf9a219f07':
  Fix memory leak in setActionProvider() - framework edition
 2015-07-01 17:11:40 +00:00
Filip Gruszczynski
d40c423b1c Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev 2015-07-01 17:03:03 +00:00
John Reck
a4ac386d2a Merge "Make querying the graphics stats service more defensive" into mnc-dev 2015-07-01 16:56:09 +00:00
Paul Jensen
e51c46b068 Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev 2015-07-01 14:31:21 +00:00
George Mount
cb23ec418e Merge "Add missing addPauseListener." into mnc-dev 2015-07-01 14:10:11 +00:00
Chris Banes
2bc8485ba7 Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 2015-07-01 07:58:05 +00:00
Svet Ganov
ce3b66f542 am aadc90b5: am 67a461ec: Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev 
* commit 'aadc90b51ce08b8a8adc44d8fa1a1a96476702da':
  Rename uses-permission-m to uses-permission-23
 2015-07-01 01:06:52 +00:00
Yohei Yukawa
aefe8e4d75 am 93ed9858: am 63c4a718: Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev 
* commit '93ed98580c151ec28952ec4d72010b24b55a3583':
  Reland "Fixed constant window switching on lock screen..."
 2015-07-01 01:06:47 +00:00
Dianne Hackborn
b612522047 am 78e67d73: am 80abf887: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '78e67d73e3d44831ac310cbf8e4e0f341440fcc5':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-01 01:06:36 +00:00
Adam Lesinski
57a324033b am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 
* commit '4718afcd2e5d52638ba1c4f58b2db6aea01171de':
  BatteryStats: Record cpu power usage from /proc/uid_cputime
 2015-07-01 01:06:31 +00:00
Svet Ganov
67a461eca8 Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev 2015-07-01 00:55:58 +00:00
Yohei Yukawa
63c4a7185c Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev 2015-07-01 00:51:36 +00:00
Dianne Hackborn
80abf887a1 Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-01 00:41:46 +00:00
Adam Lesinski
14b5701029 Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 2015-07-01 00:40:25 +00:00
Dianne Hackborn
593334ab70 Fix issue #22124996: VI: Command Request not Active 
Just forgot to add the request to the active set.

Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.

Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
 2015-06-30 16:59:41 -07:00
Adam Lesinski
0a7b6d6cf9 am 509dbdb6: am 49a2a698: Merge "Add helper function to extract app ID from shared app gid." into mnc-dev 
* commit '509dbdb68640679a35384bb8e56f63790e1218d3':
  Add helper function to extract app ID from shared app gid.
 2015-06-30 23:40:52 +00:00
Amith Yamasani
67abd3b356 am da3d7b2b: am 2b64ec47: Merge "Don\'t allow non-admins to adopt sd card for internal storage" into mnc-dev 
* commit 'da3d7b2bd7311bbec91b60199c85ceb22750139e':
  Don't allow non-admins to adopt sd card for internal storage
 2015-06-30 23:26:30 +00:00
Yohei Yukawa
d1a092218b Reland "Fixed constant window switching on lock screen..." 
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.

Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.

Bug: 18021493
Bug: 22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
 2015-06-30 16:22:05 -07:00
Adam Lesinski
49a2a6985d Merge "Add helper function to extract app ID from shared app gid." into mnc-dev 2015-06-30 23:16:20 +00:00
Svet Ganov
ffd25bbed1 Rename uses-permission-m to uses-permission-23 
bug:20072113

Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
 2015-06-30 23:06:41 +00:00
Chet Haase
1ee7dc939f am 58517a20: am 081ddbe2: Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev 
* commit '58517a20011dfe777d75e2c16f6d47230e0a67b3':
  Invalidate parent when scrolling child view back onto screen
 2015-06-30 23:05:36 +00:00
Amith Yamasani
2b64ec470c Merge "Don't allow non-admins to adopt sd card for internal storage" into mnc-dev 2015-06-30 23:00:08 +00:00
Chet Haase
081ddbe296 Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev 2015-06-30 22:46:44 +00:00
Chet Haase
1b7f8f99c3 Invalidate parent when scrolling child view back onto screen 
This bug caused views which used to be quick-rejected to continue to not
be drawn because the parent's DisplayList no longer contained them. The
fix is to notice when offsetting a view puts it back on screen and invalidates
the parent appropriately.

Issue #21413554  offsetTopAndBottom requires invalidating parent when view becomes visible again

Change-Id: I0f5d2cc48e3da912a41635712d9c37fb30e70c86
 2015-06-30 15:33:30 -07:00
Filip Gruszczynski
2987f616fa resolved conflicts for merge of 300ccf4a to mnc-dev 
Change-Id: Ia315e314bfde0c066a2c25d93f8cbdc71fee0a14
 2015-06-30 15:03:30 -07:00
Doris Liu
3246ac082d am 94d225d8: am e08f3b3f: Merge "Resolve CompoundButton\'s foreground drawable for layout direction change" into mnc-dev 
* commit '94d225d80be2b76ed7ad0f64946d81ce15845e1f':
  Resolve CompoundButton's foreground drawable for layout direction change
 2015-06-30 22:02:17 +00:00
Doris Liu
efd9b869d7 am a5aedadc: am 99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev 
* commit 'a5aedadc0b94bab3277e7bf044250edfa41a71f0':
  Allow null child view when checking whether divider should draw
 2015-06-30 22:02:12 +00:00
Adam Lesinski
f4216d30cd Add helper function to extract app ID from shared app gid. 
Bug:22008744
Change-Id: Ifadc7df3777dd74932833f4d22a0e285d7bdaf95
 2015-06-30 15:00:22 -07:00
Doris Liu
e08f3b3ff5 Merge "Resolve CompoundButton's foreground drawable for layout direction change" into mnc-dev 2015-06-30 21:42:43 +00:00
Chris Craik
bfb3afcad9 am 20d54457: am ca985b54: Merge "Don\'t display layout bounds of GONE views" into mnc-dev 
* commit '20d544571168cad62db4d86c91b3dfde7c13a342':
  Don't display layout bounds of GONE views
 2015-06-30 21:40:51 +00:00
Alan Viverette
fe7b878ff5 am d3ddb2f7: am b35e8667: Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev 
* commit 'd3ddb2f7d2486a481b1d800c1dc9712b19b412ab':
  Handle null argument in ImageView.setImageIcon()
 2015-06-30 21:40:46 +00:00
Doris Liu
99aa13ec10 Merge "Allow null child view when checking whether divider should draw" into mnc-dev 2015-06-30 21:35:09 +00:00
Chris Craik
ca985b54c8 Merge "Don't display layout bounds of GONE views" into mnc-dev 2015-06-30 21:22:26 +00:00
Amith Yamasani
462ac3a2aa Don't allow non-admins to adopt sd card for internal storage 
Bug: 21883016
Change-Id: I9af3eeffd860b076e69bb02a3dc06edba5f95898
 2015-06-30 14:21:01 -07:00
Doris Liu
f102d4266b Allow null child view when checking whether divider should draw 
The beginning divider should draw before the first child that is not
set to GONE. Incidentally, there needs to be a check for such a child,
which involves checking the visibility of all the children with lower
indices. This CL takes into account the scenarios where children with
lower indices could be null, in which case we'll treat them as if they
were GONE.

Bug: 22199594
Change-Id: Iefc73ef87beec219898c967b9a3ccebd1e3b5b4c
 2015-06-30 13:57:28 -07:00
Alan Viverette
b35e866713 Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev 2015-06-30 20:53:31 +00:00
Chris Craik
a1dab8bb0f Don't display layout bounds of GONE views 
bug:22126532

Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
 2015-06-30 13:51:26 -07:00
Alan Viverette
6ef129e09d Handle null argument in ImageView.setImageIcon() 
Provides consistency with setImageDrawable(). Also updates docs and
annotations for setImageZzz() methods that can take null.

Bug: 21664964
Change-Id: Ia9b7f8ee9edb23eeea457520bea4dd261decc794
 2015-06-30 13:32:27 -07:00
Robert Schaub
e51d6d05e9 am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs 
* commit 'fae35eed99d6bc87f3a864bdd16d951136a16cc7':
  docs: Changed link in Java source code comment to repair 404
 2015-06-30 20:26:36 +00:00
Filip Gruszczynski
300ccf4ab5 am 0ec1328f: Calculate outset hint when adding window. 
* commit '0ec1328f85a08a610868856c688ebb8196c79c17':
  Calculate outset hint when adding window.
 2015-06-30 20:20:48 +00:00
John Reck
828698b012 Make querying the graphics stats service more defensive 
Bug: 21750734

Doesn't fix the underlying issue that we were unable to
get a buffer but as this is non-critical be more defensive
about failures.

Change-Id: I7f2faaa35b064e3d0da0a13dba9aae3c226b9acc
 2015-06-30 12:57:42 -07:00
Svet Ganov
49316d83d5 am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 
* commit 'ab4f6ff013860e5fbb72542d9c47165a47244b0f':
  Installer is a part of the system with unrevocable permissions
 2015-06-30 19:44:27 +00:00