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

34131 Commits

Author SHA1 Message Date
RoboErik
8fb4cf1ef4 Merge "Move Session apis to android.media.session" 2014-02-26 18:13:35 +00:00
George Mount
206e30cd93 Revert "Change Activity Scene Transitions to be more automatic." 
This reverts commit f10587faadb9080a7bf9991cbe04bac5525da482.

Change-Id: I2785a3d2d6b667cad6d61dcbbc1c624161735fa4
 2014-02-26 08:56:30 -08:00
Alan Viverette
14b51940e9 Merge "Constrain starting sub row to list bounds" 2014-02-26 03:04:36 +00:00
Alan Viverette
2546fcf5c9 Constrain starting sub row to list bounds 
BUG: 13077653
Change-Id: Id01da055e8502b1447519666eb439d8480437c6c
 2014-02-25 18:45:03 -08:00
RoboErik
2f5b057da7 Move Session apis to android.media.session 
This is to make it easier to distinguish the new apis from the old
ones.

Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
 2014-02-25 16:01:55 -08:00
George Mount
121e25dcf0 Merge "Change Activity Scene Transitions to be more automatic." 2014-02-25 23:47:57 +00:00
Dianne Hackborn
a1f1a3c573 More battery stats. 
- Add events for sync.
- Add more descriptive tags for wake events.
- Fix battery reset.
- Fix tracking of wifi data.

Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
 2014-02-25 13:20:07 -08:00
John Spurlock
a77cf87354 Merge "Tabs -> spaces in frameworks/base." 2014-02-25 19:57:33 +00:00
Martijn Coenen
6924c4ef8d Fix NFC docs breakage. 
Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
 2014-02-25 11:51:11 -08:00
George Mount
f10587faad Change Activity Scene Transitions to be more automatic. 
Shared element transitions are enabled by default
when the Window has a TransitionManager.

Shared element location and size are captured and
transferred to the target Activity.

ActionBar is treated as a shared element.

Change-Id: I0f22ea4e5cbe80254e848444e3f235cb742684f4
 2014-02-25 11:12:16 -08:00
Craig Mautner
b5abedbd5c am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev 
* commit 'c407ace3019c4e542654cf17fd04d9436d3f3436':
  Clean up activities and displays when done
 2014-02-25 18:56:11 +00:00
Craig Mautner
d4c819c002 am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev 
* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done
 2014-02-25 18:49:37 +00:00
Craig Mautner
dd9ce6287e Merge "Clean up activities and displays when done" into klp-modular-dev 2014-02-25 18:46:01 +00:00
Martijn Coenen
c197019054 Merge "Add an API to manually invoke Android Beam." 2014-02-25 18:43:37 +00:00
Craig Mautner
95da1087ed Clean up activities and displays when done 
More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
 2014-02-25 10:40:18 -08:00
Hui Lu
d22f23b2d6 am fcf7d3a6: am eeb291b7: am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit 'fcf7d3a64947a8a0f05ee9e0669abe4a0727f926':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 18:03:07 +00:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
 2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base. 
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
 2014-02-25 09:49:29 -05:00
Kenny Guy
e21c52a8c9 Merge "Hide managed profiles from user switchers." 2014-02-25 13:01:38 +00:00
Nicolas Prevot
1f63810638 Merge "Adding the requiredForProfile flag." 2014-02-25 10:35:25 +00:00
Alan Viverette
6dd4e28b60 Merge "Force measurement in LinearLayout if any views are skipped" 2014-02-25 02:49:02 +00:00
Alan Viverette
65be9cc34c Force measurement in LinearLayout if any views are skipped 
BUG: 12249256
Change-Id: I805cc70c4a2982befd9eb625be1378e6a2d9eba6
 2014-02-24 18:21:09 -08:00
Zhijun He
cc28a41b48 Camera2: Correct some minor errors in awb region spec 
Also correct some other typos.

Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
 2014-02-24 15:11:23 -08:00
Chris Craik
be85725e1e Merge "Damage IsolatedZVolume when shadows change" 2014-02-24 21:22:24 +00:00
John Reck
ee64201004 Merge "Add back resize buffer" 2014-02-24 20:41:16 +00:00
Dianne Hackborn
aec25d9224 Merge "Improve how battery stats collects network stats." 2014-02-24 20:33:42 +00:00
Alan Viverette
462c2177f7 Check for ongoing detachment in AbsListView 
BUG: 13167767
Change-Id: Ie1a828eadbb99daef46af77544f233fee09fd1bc
 2014-02-24 12:24:47 -08:00
Dianne Hackborn
d0c5b9abed Improve how battery stats collects network stats. 
This optimizes the path for battery stats to collect
per-uid network usage.  It now collects wifi and mobile
usage separately, with a path that allows it to recycle
all data structures and filter out stats it isn't
interested in before they come back to java.

This is setting us up for the actual goal, to collect
mobile stats independently each time the mobile radio
goes down, allowing us to distribute mobile radio usage
across uids based on the number of packets they transferred
during a session.

Change-Id: I21a0f517cf087ea5aa8b8dd535e20b46e361a52b
 2014-02-24 11:35:20 -08:00
Kenny Guy
1a447535ce Hide managed profiles from user switchers. 
Hide managed profiles from lockscreen user switcher on tablets.
Hide managed profiles from power menu user switcher on phones.
Add flag to enable multi user ui turned off by default.

Change-Id: I4c69a6f7b0f39c249fc85fd940318df1ddab073f
 2014-02-24 19:24:42 +00:00
Alan Viverette
35e2721399 Merge "Check for null view root before checking for accessibility focus" 2014-02-24 19:09:59 +00:00
Alan Viverette
2e6fc8ca56 Check for null view root before checking for accessibility focus 
BUG: 13168971
Change-Id: Ia75d77b18112371f56a624e11f9509f14ec98093
 2014-02-24 11:09:18 -08:00
Zhijun He
688084914d Merge "Camera2: update 3A state related metadata key docs" 2014-02-24 18:40:03 +00:00
Zhijun He
60b19dc2df Camera2: update 3A state related metadata key docs 
Bug: 12840262
Change-Id: I2092e1d24b262a0568b880094b8ad6a87510b346
 2014-02-24 10:19:20 -08:00
Chad Brubaker
4845037a48 Merge "Add the calling package name to requestRouteToHost" 2014-02-24 18:09:36 +00:00
Nicolas Prevot
531270a4a1 Adding the requiredForProfile flag. 
Enabling to use requiredForProfile in application manifests
It determines which applications will be installed for managed profiles
and for restricted profiles

Change-Id: I14b4de2c9f41c2bbf5cd9fd0ca6caf5ce2d04131
 2014-02-24 18:03:14 +00:00
Torne (Richard Coles)
875e2101d7 Fix missing # in method name in javadoc. 
Fix doc generation.

Change-Id: I2e333a7224eeaff7a870fedc7f7a4eb113d1fe2f
 2014-02-24 14:11:56 +00:00
Yohei Yukawa
e0ebe276e5 Merge "Remove trailing spaces and tabs" 2014-02-24 11:20:49 +00:00
Yohei Yukawa
66996dafa7 Remove trailing spaces and tabs 
Actual fix will be covered by subsequent patches.

BUG: 12954290
Change-Id: I55f2374fd447d5b3d5a696de6f9b493e32f4e17a
 2014-02-24 19:51:04 +09:00
Sander Alewijnse
627de95925 Merge "Enables a profile owner or device owner to set and clear default intent handler activities." 2014-02-24 10:16:28 +00:00
Alan Viverette
cc3f33853b Allow alpha modulation in ColorStateList items 
This makes it much easier to define a disabled state color as an alpha
modulation of some base color.

Change-Id: Ie2ecf40b1f6560fcd8eda208d780616dddfc0d08
 2014-02-22 16:52:46 -08:00
Craig Mautner
92a507986a am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev 
* commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
  Fixes for ActivityView on home activity
 2014-02-22 07:51:02 +00:00
Craig Mautner
c004c9a87f am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev 
* commit 'ffda464851008f750246f343c939d8003071cd23':
  Fixes for ActivityView on home activity
 2014-02-22 07:33:24 +00:00
Craig Mautner
12ff7391a1 Fixes for ActivityView on home activity 
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
 2014-02-21 21:08:00 -08:00
John Reck
e56e9df5f1 Add back resize buffer 
Bug: 12825810

Change-Id: Ic2329c30524010f54778101853b30f8f8d9eeb6c
 2014-02-21 18:12:04 -08:00
Chris Craik
ff641477a7 Damage IsolatedZVolume when shadows change 
bug:12874322
Change-Id: I3dd92f551dfb00965ccd08647586f378f8949b1c
 2014-02-21 16:59:56 -08:00
Alan Viverette
550267f72b Fix refactoring of invalidate methods 
Was incorrectly clearing the DRAWN flag and updating mLastIsOpaque from
partial invalidations, though why this should be different is somewhat
of a mystery.

BUG: 13138721
Change-Id: Ic8d11a64406bc78e94adec7355c1f50d87567887
 2014-02-21 16:48:33 -08:00
Greg Hackmann
4418372b21 am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp 
* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
 2014-02-22 00:46:52 +00:00
Alan Viverette
3b49a8a629 Fix typo in invalidate 
BUG: 13138721
Change-Id: If7e10208c3ba752eca5f5cbcf26f8a63b1f4ad51
 2014-02-21 16:37:32 -08:00
Greg Hackmann
0cab896a98 resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp 
Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
 2014-02-21 16:35:52 -08:00