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

49608 Commits

Author SHA1 Message Date
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
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
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
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
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
Svet Ganov
4a23ac4589 Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 2015-06-30 19:24:05 +00:00
Maxim Bogatov
b0c1485d41 am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev 
* commit '24815124600a12a9a0ef1d7a8883ab2c8e5c1525':
  Let TextView clear accessibility selection index
 2015-06-30 19:07:50 +00:00
Maxim Bogatov
7a2e4b8f80 Merge "Let TextView clear accessibility selection index" into mnc-dev 2015-06-30 18:45:52 +00:00
Doris Liu
3380e69f55 Resolve CompoundButton's foreground drawable for layout direction change 
This CL adds a step to resolve CompoundButton's foreground drawable when
layout direction has been changed. Prior this CL, only background drawable
of the button resolves its layout direciton in respond to system wide
layout direction change. This CL makes the foreground and background
drawables consistent in layout direciton.

Bug: 16376848
Change-Id: I9a4eb1e010e6ab61ef8684005508bd36486ec1f3
 2015-06-30 11:26:47 -07:00
Svet Ganov
fb498a311d am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev 
* commit 'c5c8995510943527f99e51b04809dae090f0c2ab':
  Add read/write external storage app ops
 2015-06-30 17:23:30 +00:00
Svet Ganov
6a166af8fd Installer is a part of the system with unrevocable permissions 
1. Mark the installer permissions as not revocable.

2. Make the permission result dispatch more robust to handle installer death.

bug:22012614

Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
 2015-06-30 10:15:49 -07:00
Svet Ganov
b24ff7e03a Merge "Add read/write external storage app ops" into mnc-dev 2015-06-30 16:50:17 +00:00
George Mount
7f8f9e5b13 am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 
* commit 'aa315dbb361e447b6442efc562b41d9b6fedf4e4':
  Fix FragmentTransaction replace() behavior
 2015-06-30 14:45:46 +00:00
George Mount
0303d9ce70 Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 2015-06-30 14:21:49 +00:00
Kenny Guy
2b3eccaec6 am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit 'd0418e8cf9a250183a2fc3d7474f82dc9e2da734':
  Deprecate APIs for admin to create users.
 2015-06-30 13:25:21 +00:00
Kenny Guy
31659c253e Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-30 13:03:32 +00:00
Billy Lau
67dfa49194 am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 
* commit 'e4c3fd725ea8870756428a6580052a34fc676299':
  Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
 2015-06-30 09:56:15 +00:00
Esteban Talavera
283b7ace80 am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 
* commit '37fd8bd182c110b98772876f3fa47cc4d54042bc':
  Marking some globals from setGlobalSetting as not supported
 2015-06-30 09:56:10 +00:00
Billy Lau
f62f4c94a3 Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 2015-06-30 09:05:34 +00:00
Esteban Talavera
fef8cbd6a6 Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 2015-06-30 08:55:38 +00:00
Benjamin Franz
aa2b791079 am adb41d8f: am 01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev 
* commit 'adb41d8f6cfb2f33240c11cc6850994579952ea1':
  Make ContentObservers work across profiles
 2015-06-30 08:00:48 +00:00
Benjamin Franz
01b079f7d2 Merge "Make ContentObservers work across profiles" into mnc-dev 2015-06-30 07:45:50 +00:00
Erik Kline
f2a08d054c am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev 
* commit '49aeed9f3fe7d8e7af2fff549587546dfe4361d1':
  Fix use of reachable DNS server logic
 2015-06-30 06:55:42 +00:00
Erik Kline
5f950417f6 Merge "Fix use of reachable DNS server logic" into mnc-dev 2015-06-30 06:32:23 +00:00
Andreas Gampe
9958e75b51 am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 
* commit '97378a628bc7edeb109af2bae32ec920970158bb':
  Frameworks/base: Remove UsageEvents finalizer
 2015-06-30 05:58:53 +00:00
Andreas Gampe
6feb4301eb Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 2015-06-30 05:40:08 +00:00