Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,352 Commits 3 Branches 0 Tags
9f19cb241544597bbb86f58c5cd757aa04f7cf06
Commit Graph

55007 Commits

Author SHA1 Message Date
Svet Ganov
3f69719a1b am ce3b66f5: am aadc90b5: am 67a461ec: Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev 
* commit 'ce3b66f542947211ed8ea7e09267bb66ff687a34':
  Rename uses-permission-m to uses-permission-23
 2015-07-01 01:24:49 +00:00
Yohei Yukawa
b400938058 am aefe8e4d: am 93ed9858: am 63c4a718: Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev 
* commit 'aefe8e4d75415df97b2937684c06c2bb6310cd98':
  Reland "Fixed constant window switching on lock screen..."
 2015-07-01 01:24:42 +00:00
Dianne Hackborn
507734074a am b6125220: am 78e67d73: am 80abf887: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit 'b6125220478a8cc9ae107d133b678fb7154b028b':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-01 01:20:39 +00:00
Adam Lesinski
77fa075e6d am 57a32403: am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 
* commit '57a324033bcb348a9c0d4d4774f7d5ebb4b56a41':
  BatteryStats: Record cpu power usage from /proc/uid_cputime
 2015-07-01 01:20:31 +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
e8e322fe3c am 0a7b6d6c: am 509dbdb6: am 49a2a698: Merge "Add helper function to extract app ID from shared app gid." into mnc-dev 
* commit '0a7b6d6cf9c73d63339dc0b4cb7867cb90b038db':
  Add helper function to extract app ID from shared app gid.
 2015-06-30 23:53:18 +00:00
Amith Yamasani
1df60ca5f1 am 67abd3b3: am da3d7b2b: am 2b64ec47: Merge "Don\'t allow non-admins to adopt sd card for internal storage" into mnc-dev 
* commit '67abd3b356794b316e647a9ad20a24b09406823f':
  Don't allow non-admins to adopt sd card for internal storage
 2015-06-30 23:43:31 +00: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
Chet Haase
cf5db1fa76 am 1ee7dc93: am 58517a20: am 081ddbe2: Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev 
* commit '1ee7dc939fc01d118b104d439384b96d312cca16':
  Invalidate parent when scrolling child view back onto screen
 2015-06-30 23:20:54 +00:00
Alan Viverette
72fca2ae9f am 78022801: am 29690e20: am 5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev 
* commit '7802280162439c2205a09f61cd6d1a5bfa752d96':
  Use non-greedy view to draw background in landscape time picker
 2015-06-30 23:20:47 +00: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
Alan Viverette
7802280162 am 29690e20: am 5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev 
* commit '29690e2015748b367b4794b25a7bd34c0c03a1cb':
  Use non-greedy view to draw background in landscape time picker
 2015-06-30 23:05:32 +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
Alan Viverette
aa69922ace Use non-greedy view to draw background in landscape time picker 
Bug: 21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
 2015-06-30 15:29:13 -07:00
Doris Liu
33a9cba550 am 3246ac08: am 94d225d8: am e08f3b3f: Merge "Resolve CompoundButton\'s foreground drawable for layout direction change" into mnc-dev 
* commit '3246ac082dde2d307ba7f55b10d32199b914d4a8':
  Resolve CompoundButton's foreground drawable for layout direction change
 2015-06-30 22:16:59 +00:00
Doris Liu
8a02858566 am efd9b869: am a5aedadc: am 99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev 
* commit 'efd9b869d7225af5047352f9ca0180468467d54c':
  Allow null child view when checking whether divider should draw
 2015-06-30 22:16:52 +00: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
Chris Craik
2c378a22b2 am bfb3afca: am 20d54457: am ca985b54: Merge "Don\'t display layout bounds of GONE views" into mnc-dev 
* commit 'bfb3afcad96fe38bb0f2e3cf2af2dc993ed663d8':
  Don't display layout bounds of GONE views
 2015-06-30 21:55:04 +00:00
Alan Viverette
b3ce5839d8 am fe7b878f: am d3ddb2f7: am b35e8667: Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev 
* commit 'fe7b878ff507be0cf991e24407a30d75891ac5e2':
  Handle null argument in ImageView.setImageIcon()
 2015-06-30 21:54:58 +00:00
Adam Lesinski
873bf2c48f am 9986350d: am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 
* commit '9986350d66b6106cabe8c017455561f52a727f2c':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
 2015-06-30 21:54:33 +00: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
Adam Lesinski
9986350d66 am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 
* commit '36eadf9c1d78b047d9e43bf28fe2de417cc1fce5':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
 2015-06-30 21:40:24 +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
Adam Lesinski
32ddd53466 Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 2015-06-30 20:30:46 +00:00
Svet Ganov
fc72ce8bbd am 49316d83: am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 
* commit '49316d83d518110c64fab92c423ebd263ee3b7cf':
  Installer is a part of the system with unrevocable permissions
 2015-06-30 19:56:47 +00:00
Adam Lesinski
43f222f02f BatteryStats: Account for remaining OS wakelock time at the end of processing all apps 
Bug:18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08
 2015-06-30 12:54:41 -07:00