139590 Commits

Author SHA1 Message Date
Robert Greenwalt
6078b50b01 Apply API Council comments to ConnectivityManager
rename isNetworkActive -> isDefaultNetworkActive
rename registerNetworkActiveListener -> registerDefaultNetworkActiveListener
make listenForNetwork/requestNetwork take a NetworkRequest
rename NetworkCallbackListener -> NetworkCallback
rename listenForNetwork -> registerNetworkCallback
rename releaseNetworkRequest -> unregisterNetworkCallback
remove NetworkRequest param from NetworkCallback functions
rename onNetworkCapabilitiesChagned to onCapabilitiesChanged
remove onReleased
change time units in onLosing from Sec -> ms

bug: 15142362
Change-Id: Ibc96e3f461706efe1eafa0d85605249cfd6e9fdd
2014-06-11 23:17:46 -07:00
Baligh Uddin
9aa192c210 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Baligh Uddin
7a5ae205fc Import translations. DO NOT MERGE
Change-Id: Ic5be9149b760c096c0c850e8a9a0f60bd62d819c
Auto-generated-cl: translation import
2014-06-13 12:01:20 -07:00
Jorim Jaggi
67de52cd2e Merge "Bigger clock." into lmp-preview-dev 2014-06-12 05:34:42 +00:00
Christoph Studer
c511555670 Prevent duplicate notifications
Don't trust mNotificationData being sorted consistently
at all times...which it actually should. But apparently isn't.

Instead of using binary search to find the previous instance of
the notification when it's updated, use a simple linear scan.

Bug: 15589158
Change-Id: I7a09d0c64e35bd1930b8992d19da1393f4e4bb4e
2014-06-14 20:45:54 +00:00
Jorim Jaggi
220bf5cf9a Bigger clock.
Also fixes a bug where notifications would be wrongly padded
on Keyguard after rotating the screen.

Bug: 15244051
Change-Id: I2418692c3d2ffdd5fe642361f2924629bf9a75eb
2014-06-14 22:43:12 +02:00
Jorim Jaggi
ea384193d9 Change style of clock in status bar.
Bug: 15570452
Change-Id: I39ec2e2a18d382f378d5cccd94a6a8630b55a240
2014-06-14 06:22:34 +02:00
Jorim Jaggi
587e9e1831 Merge "Revert "Improve unlock motion."" into lmp-preview-dev 2014-06-13 21:09:46 +00:00
Jorim Jaggi
cc693247dc Revert "Improve unlock motion."
This reverts commit 03599a4c8fcc539948174136878f5e0ceec1eeda.

Change-Id: Iacd5f7ecd755ee2c8efdf1e37060a21702bcf08a
2014-06-14 03:04:35 +00:00
Alan Viverette
a35064931f DO NOT MERGE Fix bright foreground & hint colors
BUG: 15616463
Change-Id: I747a3fd30e701bd2ee40df5faf2688cd5af4ee14
(cherry picked from commit cf8b6f0610868a59fd8777d8aa3c865facc73e5b)
2014-06-13 22:59:02 +00:00
Jorim Jaggi
fd9d4414e8 Improve unlock motion.
Bug: 15244051
Change-Id: Ib33a7a8e27a2dc191c6e18ffe1cd2725dfa3bb37
2014-06-12 06:08:12 +02:00
Jorim Jaggi
8f4ac9e214 Merge "Revert "Introduced fading views for the camera interaction on the lockscreen."" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Jorim Jaggi
a27b004ca0 Revert "Introduced fading views for the camera interaction on the lockscreen."
This reverts commit 4f963c1b557010bf453af500b00f36b68988f8e2.

Change-Id: I8c7df9d115be1b89b57fb9c9bb2a12b4c1d45520
2014-06-14 03:58:56 +00:00
Nick Kralevich
c2c7516139 Merge "update mLastSlash for gdbserver" into lmp-preview-dev 2014-06-12 05:34:42 +00:00
Nick Kralevich
63948b8d89 update mLastSlash for gdbserver
the gdbserver special case wasn't updating mLastSlash. Fix it.

(cherry picked from commit 195b23ef712c51dc8d2f3a1f1943a27054dc4e74)

Change-Id: I52c6bbeb5483f8f6e20dd17de29ab703a6c8ebef
2014-06-13 21:44:48 -07:00
Selim Cinek
1aed973665 Introduced fading views for the camera interaction on the lockscreen.
Bug: 15126905
Change-Id: I82b0050a4216873d9cd191b32d1e5bf6871acbd6
2014-06-12 03:33:14 +00:00
Christian Robertson
5a1f97abca Merge "New geometric system bar icons" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Christian Robertson
7f37ab64a1 New geometric system bar icons
Bug: 15599260
Change-Id: I37688f368ce22f1dc30119fe174ce701c7c147cc
2014-06-13 17:42:45 +00:00
Christian Robertson
38187927cd Merge "Tunings for touch ripple animations" into lmp-preview-dev 2014-06-12 21:07:47 +00:00
Christian Robertson
4b65f0ebee Tunings for touch ripple animations
Added a log based interpolator (it's faster in the beginning and smoother
at the finish than the decelerate interpolator)

Scaled the timing and opacity of the falloff ripple based on the size
of the outer bounding radius. Backing circles aren't as apparent for
Smaller touch targets.

BUG: 15591274
2014-06-13 00:19:40 +00:00
Dirk Dougherty
866ad0c2b2 am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit '460cab199df38b16ea1a4fc9e4f62509049cc859':
  Doc change: Update monetization docs.
2014-06-12 02:44:11 +00:00
Dirk Dougherty
460cab199d am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
  Doc change: Update monetization docs.
2014-06-12 02:41:07 +00:00
Dirk Dougherty
b024fd2087 am bdcd6fc7: Doc change: Update monetization docs.
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.
2014-06-12 02:37:27 +00:00
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs.
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
2014-06-11 17:52:07 -07:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
2014-06-12 00:06:20 +00:00
Elliott Hughes
8525fe8d0a am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.
2014-06-12 00:02:42 +00:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
Scott Main
55c11af78a Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 2014-06-11 21:23:31 +00:00
Scott Main
4795031492 reorg the SDK setup docs to streamline setup for all variations.
Move ADT plugin to the ADT help doc and combine the three setup guides
into one page that is dynamic based on a URL parameter.

Change-Id: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
2014-06-11 20:17:05 -07:00
Craig Mautner
28084383c1 am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.
2014-06-11 17:42:06 +00:00
Calin Juravle
cdd1fd7a8f am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 17:32:50 +00:00
Calin Juravle
5fc4e48742 am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
  Improved profile.start-immediately comment
2014-06-11 17:32:40 +00:00
Calin Juravle
b0492d6943 am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit '16719591f4a6b2139b1f3555dcde92d35f488b6a':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 17:28:33 +00:00
Calin Juravle
b0f59cdcb4 am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '2f84b69bf5afcf67469704e30866067b770ae786':
  Improved profile.start-immediately comment
2014-06-11 17:28:29 +00:00
Narayan Kamath
bfa6ddd02d Merge "Support deprecated language codes." 2014-06-11 15:59:20 +00:00
Narayan Kamath
e79c8ce682 Support deprecated language codes.
Locale.toLanguageTag will transform the obsolete (and
deprecated) language codes "in", "ji" and "iw" to
"id", "yi" and "he" respectively.

All versions of android prior to "L" used the deprecated
language tags, so we will need to support them for backwards
compatibility.

bug: 13230947

(cherry-picked from commit 21fc8ba39c4799a346caf95)

(also contains a partial cherry-pick of 857ba4af because
including it is the easiest way to avoid conflicts.)

Change-Id: Ia1d0f2d8e20f5679ff3990506f6468ebf789c94a
2014-06-13 19:03:13 +01:00
Robin Lee
837304f6f6 Publish DevicePolicyManager CA certificate APIs
Exposes these methods:
 - hasCaCertInstalled
 - hasAnyCaCertsInstalled
 - installCaCert
 - uninstallCaCert

Allows device and profile owners to perform some certificate management
including querying for and enabling/disabling specific CA certificates.

Change-Id: I4aa8a1a8601b234e30acde99dfa382e04cb62495
2014-06-11 16:55:32 +01:00
Jorim Jaggi
0a27be899c Fix blank lockscreen.
Bug: 15281241
Change-Id: If315891274a97fa5cc579554b83b85cf3c87f0fb
2014-06-11 15:45:22 +02:00
Daniel Sandler
c776997e87 Clean up progress bars for media & other notifications.
Bug: 15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
2014-06-11 13:18:59 +00:00
Jessica Hummel
542588e3ba Update documentation so it meets api requirements
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443

Conflicts:
	api/current.txt
	core/java/android/app/admin/DeviceAdminReceiver.java
2014-06-11 11:37:53 +01:00
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
579ace0358 am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
  Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
2014-06-11 01:18:36 +00:00
Ihab Awad
d76faab7b3 DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)
Bug: 15275904
Bug: 15196474
Change-Id: If9aeae519047b221aa2c178d8d2903c4e2054a6d
2014-06-10 18:12:44 -07:00
Jinsuk Kim
ca515e307e Merge "Added an argument isPressed to HdmiControlService#sendKeyEvent" 2014-06-10 22:31:57 +00:00
Michael Kolb
b8d5f476ff am b936c57c: (-s ours) am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev
* commit 'b936c57c2cda994cee20a72ee2b668629996a229':
  DO NOT MERGE : Fix measuring with outset for orientation
2014-06-16 22:13:29 +00:00
Colin Cross
022fa3b057 am 289476b6: am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"
* commit '289476b65b8129729936f75a3549eb99257df482':
  clean up native com.android.internal.os.Zygote
2014-06-16 22:13:18 +00:00
Alan Viverette
70b0c9c1c2 Merge "Fix ShapeDrawable constant state and theming" 2014-06-16 20:54:41 +00:00
Alan Viverette
611c1ff0de Fix ShapeDrawable constant state and theming
Change-Id: I085d7705b63ec5f94e9b9fb5ece85ae3c7d39512
2014-06-16 14:43:27 -07:00
Chris Craik
382512ecae am 0b61e9fe: (-s ours) Merge "Adjust tessellation abort depth DO NOT MERGE" into lmp-preview-dev
* commit '0b61e9febb0919b2203df46d8af0028acf8488dc':
  Adjust tessellation abort depth DO NOT MERGE
2014-06-16 21:16:47 +00:00