Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,933 Commits 3 Branches 0 Tags
02e3979d62bf4b85fe7dedeefa357748419db992
Commit Graph

40900 Commits

Author SHA1 Message Date
Wink Saville
02e3979d62 Merge commit 'e58e59cc' into fix-merge-conflict 
* commit 'e58e59cc':
  ksd to lmp-sprout-dev

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/SubInfoRecord.java
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl
	telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
 2014-09-15 12:40:02 -07:00
George Mount
48520a6c5a am e0b9e2f1: am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev 
* commit 'e0b9e2f107660e09daa5c0a5ecc1a616cd7da097':
  Fix exit transitions hiding views permanently.
 2014-09-15 14:43:29 +00:00
George Mount
2911b2046a Merge "Fix exit transitions hiding views permanently." into lmp-dev 2014-09-15 14:06:52 +00:00
Alan Viverette
14d639755e am 62b910c0: am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev 
* commit '62b910c008da3fbcf11f67340002aa14e1d297b0':
  Clean up view drawable tinting methods, fix default modes
 2014-09-15 00:00:37 +00:00
Alan Viverette
b56f5d2ab1 Clean up view drawable tinting methods, fix default modes 
Calling setTint now only modifies the tint. It won't force a mode change.

BUG: 17494736
Change-Id: I91392634869ed23981d8e61a403bb2be42aa7a07
 2014-09-14 15:48:50 -07:00
Alan Viverette
4a7ac30043 am d2f58ac3: am 84670eef: Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev 
* commit 'd2f58ac3e3e0b49f33b98bd9f99f7658fd18b9a6':
  Reduce instructions required to obtain and recycle TypedArray
 2014-09-14 20:21:46 +00:00
John Spurlock
b9e2fe1d4a am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev 
* commit '1c1683a35a0267c03729fa36b930c3dc803aff7a':
  Saver: PowerManager call to set low power mode.
 2014-09-14 20:09:39 +00:00
Alan Viverette
c6a65dfbff Merge "Reduce instructions required to obtain and recycle TypedArray" into lmp-dev 2014-09-14 20:04:38 +00:00
John Spurlock
8d4e6cb060 Saver: PowerManager call to set low power mode. 
- Add an explicit power manager call to set the low power mode state,
  instead of trying manage everything around a single setting.
- When low-power mode is triggered by falling below the configured
  threshold, it does not update the setting.
- The "is-enabled" api returns setting || below configured trigger.
- Move the snooze management into the new api call.
- Callers (sysui + settings) updated to use the api instead of the
  setting.
- Handles the case where the level does an unpowered leap out of the
  low battery level. (Possible if powered in-between while the device
  is off)

Bug:17460535
Change-Id: Ic030504c9cad9868a7137abbe837b170da37852b
 2014-09-14 14:07:23 -04:00
Alan Viverette
8b5b25b448 Reduce instructions required to obtain and recycle TypedArray 
Eliminates several field and method accesses by making the TypedArray
pool local to a single Resources object. Removes an unnecessary
synchronization.

ReadXmlAttrs averaged 0.069 ms/op before, 0.064 ms/op after.

BUG: 17484798
Change-Id: If790a5ba6596b47a04f117c8912974798a592052
 2014-09-13 19:30:11 -07:00
Tyler Gunn
8bc3996189 am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit '2128258322aa2f90d65c1963ede79d1bffb3fce4':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:04 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Jeff Brown
8c3b757948 am 18f9b97a: am ce0a756f: Merge "Add support for dozing after screen off." into lmp-dev 
* commit '18f9b97ac486e93ca62e2d30a5eb29b2b3763add':
  Add support for dozing after screen off.
 2014-09-13 03:13:07 +00:00
Adam Powell
f1be67f3ea am 8e8d8655: am dd9488c1: Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev 
* commit '8e8d86559e4938daed3bb018afb61336e643e2e3':
  Provide a public API for View#computeFitSystemWindows
 2014-09-13 02:37:35 +00:00
Eric Laurent
3eb236cca0 am 8d002c9e: am a7f44594: Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev 
* commit '8d002c9e1069577bd624889229d9047611aca0d2':
  SoundTrigger: fix KeyphraseRecognitionEvent parceling
 2014-09-13 02:37:30 +00:00
Paul Jensen
ae0477be09 am 11ee98ad: am 28b89f98: Allow libcore to perform necessary actions upon net config changes. 
* commit '11ee98ade47dddefa60cf3f54a3a4c82a5d5f7ee':
  Allow libcore to perform necessary actions upon net config changes.
 2014-09-13 02:36:05 +00:00
Amith Yamasani
6248ea5852 am 67e56d47: am 13c4e5ad: Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev 
* commit '67e56d47d8416c73973c92557abefa7aa3975f7c':
  Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
 2014-09-13 02:35:59 +00:00
George Mount
3f1c575c1f am a8e0fb44: am 87483e5e: Merge "Made Transitions act only the views that they target." into lmp-dev 
* commit 'a8e0fb449cd488bde6833871f978fde40bc83d5c':
  Made Transitions act only the views that they target.
 2014-09-13 02:33:58 +00:00
George Mount
f2e84ad9bf am 5104c665: am 17506bdb: Merge "Allow Path Animations to support overshooting." into lmp-dev 
* commit '5104c6656a906340b44f54fc052a8c499419ab35':
  Allow Path Animations to support overshooting.
 2014-09-13 02:30:44 +00:00
Dianne Hackborn
40461ddd8c am 46c1851a: am a561b237: Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev 
* commit '46c1851a7d14c8ac8614deb2183a89a44448e57c':
  Allow throwing UnsupportedOperationException across Binder.
 2014-09-13 02:30:20 +00:00
Jeff Brown
2175e9c366 Add support for dozing after screen off. 
On some devices, we want the screen off transition to complete before
we start dozing.  Added a new config.xml attribute config_dozeAfterScreenOff
to configure this behavior.

Defer starting dreams until the display is ready.

Fixed some minor issues in the system UI doze service when setting the
display state.

Bug: 16187655
Change-Id: Ib1bc60de5457166f4b4880732db5df989dda67a4
 2014-09-12 17:31:54 -07:00
Adam Powell
2642357b82 Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev 2014-09-13 00:22:29 +00:00
Eric Laurent
76466c7be3 Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev 2014-09-13 00:21:48 +00:00
Paul Jensen
e401d17d3f Allow libcore to perform necessary actions upon net config changes. 
Delegate to libcore the responsibility of performing the necessary
actions upon a network configuration change, such as a DNS
configuration change.  In the L-release, these responsibilities
now include flushing the HTTP connection pools to prevent connections
on lingering networks getting pulled from the pool inadvertently to
satisfy requests that should be going over the new network.  All such
responsibilities can now be controlled and delegated by libcore's
new NetworkEventDispatcher, designed for this purpose.

bug:17314604
Change-Id: Ic796aea9d9a1f6ecb787fbdb38b3b7f5d991829b
 2014-09-12 23:59:55 +00:00
Adam Powell
d72068b38e Provide a public API for View#computeFitSystemWindows 
The current hidden API is necessary to perform correct inset behavior
for support libraries like appcompat. Provide a public method
consistent with the new WindowInsets APIs.

Bug 17411097

Change-Id: I71a63eea0238b94cae6b5c6f1721d5567560ba81
 2014-09-12 16:51:28 -07:00
Amith Yamasani
d7fcca9511 Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev 2014-09-12 23:50:40 +00:00
Amith Yamasani
1d653272a2 Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS 
Bug: 17392243
Change-Id: I5ff0e70eeeeba264c96eaa2a17a6bd3669576c96
 2014-09-12 16:45:33 -07:00
George Mount
a5757799f2 am 8f833d94: am 9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev 
* commit '8f833d941746993b0c1524fcc83e60084d9e81ae':
  Fixed: getDecor() NullPointeExceptions.
 2014-09-12 23:21:38 +00:00
Yin-Chia Yeh
c01898c073 am 3661aa85: am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev 
* commit '3661aa8594e17d4d1401a86993d19e436f3ae525':
  Camera2: add toString for TonemapCurve
 2014-09-12 23:21:28 +00:00
George Mount
bc3e75a5c1 am 1390a1a2: am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev 
* commit '1390a1a2c6eca730b7606cc700aa1b42fc71b6ab':
  Reset the alpha for offscreen views.
 2014-09-12 23:21:23 +00:00
Adam Powell
214860b030 am 7362db5d: am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev 
* commit '7362db5d1c24ccc9e0c641d8d3f5ff0eefb1bc37':
  Make Toolbars eat touch events
 2014-09-12 23:21:18 +00:00
George Mount
cb9ebc088a am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev 
* commit '47dece7797c4fc6e19b42b605a5b9d45023a0bc9':
  Changed method name to match Activity's method name.
 2014-09-12 23:21:01 +00:00
George Mount
4d527888ac Merge "Made Transitions act only the views that they target." into lmp-dev 2014-09-12 23:19:15 +00:00
George Mount
5030c7f6f1 Made Transitions act only the views that they target. 
Bug 17465989
Bug 17452585

Change-Id: I2f921e98f68df3d549a370179c0a4488d56923ad
 2014-09-12 16:15:44 -07:00
George Mount
64ec46dbb0 Merge "Allow Path Animations to support overshooting." into lmp-dev 2014-09-12 22:48:28 +00:00
George Mount
bc68f5adc2 Allow Path Animations to support overshooting. 
Bug 17458698

Change-Id: I7a29fc8932a28121d7db8b3bf695d91a55ef059b
 2014-09-12 15:46:02 -07:00
Eric Laurent
75b433f737 SoundTrigger: fix KeyphraseRecognitionEvent parceling 
Always include the Audioformat in the parcel if not
null.

Bug: 17489186.
Change-Id: I8bea031942b55078e5637959d5bf70961d134733
 2014-09-12 15:45:47 -07:00
Dianne Hackborn
8190b79d37 Merge "Allow throwing UnsupportedOperationException across Binder." into lmp-dev 2014-09-12 22:35:48 +00:00
George Mount
b694e08054 Fix exit transitions hiding views permanently. 
Bug 17480692

When a view was hidden prior to the transition completion,
the hidden views were being removed from the list and thus
weren't being reset to visible properly.

Change-Id: If778540156432eb19039fcec18d023d06e9c1b2a
 2014-09-12 15:13:14 -07:00
George Mount
e0947064af Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev 2014-09-12 22:02:37 +00:00
Yin-Chia Yeh
8eec09a1fc Merge "Camera2: add toString for TonemapCurve" into lmp-dev 2014-09-12 21:55:12 +00:00
George Mount
54f4ba8d7a Merge "Reset the alpha for offscreen views." into lmp-dev 2014-09-12 21:52:28 +00:00
Adam Powell
f116056a80 Merge "Make Toolbars eat touch events" into lmp-dev 2014-09-12 21:49:25 +00:00
George Mount
26f68a01b4 Merge "Changed method name to match Activity's method name." into lmp-dev 2014-09-12 21:28:45 +00:00
Dianne Hackborn
33d738a102 Allow throwing UnsupportedOperationException across Binder. 
Change-Id: I3a9b81958886033d546c3a20331716dbb9492365
 2014-09-12 14:23:58 -07:00
George Mount
85ea498d86 Changed method name to match Activity's method name. 
Bug 17488968

Change-Id: I3f00561d96ff33e8eaf7234934c69e3b8e2681e8
 2014-09-12 14:19:40 -07:00
Yin-Chia Yeh
b086421b41 Camera2: add toString for TonemapCurve 
Bug: 16899576
Change-Id: Id7c08afed8606efc880cc75201287cd70a0e301c
 2014-09-12 14:12:13 -07:00
Adam Powell
61d15b9856 Make Toolbars eat touch events 
Just like action bars, toolbars shouldn't allow touches to fall
through to sibling views that they overlap.

Bug 17483356

Change-Id: I9068e1f9cf3c4226000e0058c371283a997b1bd0
 2014-09-12 14:11:28 -07:00
George Mount
653ea66a9f Reset the alpha for offscreen views. 
Bug 17469303

When stripping the offscreen views from a transition, the alpha
wasn't reset, so they were made permanently invisible.

Change-Id: I2e87fff1d3b1e417997cabf9c703143355fe2c01
 2014-09-12 13:58:12 -07:00
Alan Viverette
7d6fc23fe7 am 99c628c4: am 4e7d44a5: Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev 
* commit '99c628c49642ac29511f7ae642ebfd031091a026':
  Fix toolbar height, list divider alpha, action item padding
 2014-09-12 20:27:11 +00:00