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

115144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
01c34ac6f5 am c0cad456: (-s ours) am 6db72277: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c0cad45666372c7deafaa72ffbd50b86b6d6210b':
  Import translations. DO NOT MERGE
 2013-10-11 08:16:07 -07:00
Baligh Uddin
d7b78c3873 am 25130be0: (-s ours) am 491ad45f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '25130be0cbfea53b53007e491ef4f313bc261b4a':
  Import translations. DO NOT MERGE
 2013-10-11 08:16:05 -07:00
Baligh Uddin
907c649784 am bcb05cd0: (-s ours) am d32e9b7f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bcb05cd06c366e781ae9ae5e262622b39b45d426':
  Import translations. DO NOT MERGE
 2013-10-11 08:16:02 -07:00
Baligh Uddin
293c23a860 am b7c280af: (-s ours) am 29cff852: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b7c280af9a2908ce849de281e92d31ff4f8d1cd6':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:59 -07:00
Baligh Uddin
7054f6e3c0 am a60212ab: (-s ours) am d010f7a3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a60212ab90634d63f434b14a65c08ec1d2362f00':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:56 -07:00
Baligh Uddin
3a7907be47 am 3cf39ba8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '3cf39ba82a0b0ccb0bf9a7f615a83ba4b00b240b':
  Import translations. DO NOT MERGE
 2013-10-11 08:12:25 -07:00
Baligh Uddin
64f043da26 am e4e6a4f3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'e4e6a4f3afa30d3cb9117788fbe1571f1fa5afb0':
  Import translations. DO NOT MERGE
 2013-10-11 08:12:23 -07:00
Baligh Uddin
fbd88579a6 am d52cfad3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'd52cfad38fbcdf16ca835d686cefed2f815a0e01':
  Import translations. DO NOT MERGE
 2013-10-11 08:12:19 -07:00
Baligh Uddin
dbea999257 am 57612468: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '576124688bc63db7371436905cf16cd248ce6b8a':
  Import translations. DO NOT MERGE
 2013-10-11 08:12:16 -07:00
Baligh Uddin
ba3b6a3766 am 40705a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '40705a8b55b45954e108ae89c7962f84e9f4e72c':
  Import translations. DO NOT MERGE
 2013-10-11 08:12:12 -07:00
Baligh Uddin
f6644d81f3 am 829b3dfa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '829b3dfae033084beac9189682f1d191f3eaac16':
  Import translations. DO NOT MERGE
 2013-10-11 08:12:09 -07:00
Baligh Uddin
c0cad45666 am 6db72277: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6db722776b1486072724a6d361ba474835cf055e':
  Import translations. DO NOT MERGE
 2013-10-11 08:11:21 -07:00
Baligh Uddin
25130be0cb am 491ad45f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '491ad45fee7e84772ff93d351125951a0e219174':
  Import translations. DO NOT MERGE
 2013-10-11 08:11:19 -07:00
Baligh Uddin
bcb05cd06c am d32e9b7f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd32e9b7ffb9e7657c510f69cc2c770bd8986c95c':
  Import translations. DO NOT MERGE
 2013-10-11 08:11:16 -07:00
Baligh Uddin
b7c280af9a am 29cff852: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '29cff85287867f98edd9ebba5c580e4dbc460e89':
  Import translations. DO NOT MERGE
 2013-10-11 08:11:13 -07:00
Baligh Uddin
a60212ab90 am d010f7a3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd010f7a3e2df30d08ce03312e7bf2232b8a4ffad':
  Import translations. DO NOT MERGE
 2013-10-11 08:11:09 -07:00
Baligh Uddin
3cf39ba82a Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:09:11 +00:00
Baligh Uddin
e4e6a4f3af Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:08:58 +00:00
Baligh Uddin
6db722776b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:08:53 +00:00
Baligh Uddin
d52cfad38f Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:08:44 +00:00
Baligh Uddin
491ad45fee Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:08:39 +00:00
Baligh Uddin
576124688b Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:08:29 +00:00
Baligh Uddin
d32e9b7ffb Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:08:10 +00:00
Baligh Uddin
40705a8b55 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:08:00 +00:00
Baligh Uddin
29cff85287 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:07:57 +00:00
Baligh Uddin
829b3dfae0 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:07:47 +00:00
Baligh Uddin
d010f7a3e2 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:07:42 +00:00
Daniel Sandler
bc1efa92c4 am 3b4e1c0a: am 26b49a7d: Merge "Be sure to update the display metrics on config change." into klp-dev 
* commit '3b4e1c0acdd6e65a0ce957cf794e5161f07d7e23':
  Be sure to update the display metrics on config change.
 2013-10-11 08:04:18 -07:00
Daniel Sandler
3b4e1c0acd am 26b49a7d: Merge "Be sure to update the display metrics on config change." into klp-dev 
* commit '26b49a7dbbeda13f62200c2a04984b638e7aa1ea':
  Be sure to update the display metrics on config change.
 2013-10-11 08:01:16 -07:00
Daniel Sandler
26b49a7dbb Merge "Be sure to update the display metrics on config change." into klp-dev 2013-10-11 14:58:13 +00:00
Daniel Sandler
7e8ae50efb Be sure to update the display metrics on config change. 
Regression of ancient bugs 6955586 & 7086018 (navigation bar
missing buttons since they're stacked up off the screen
along the wrong axis).

Bug: 10341684
Change-Id: I778b085bf256cb20ecceaf38fd229a7de9b75aae
 2013-10-11 00:46:04 -04:00
Vineeta Srivastava
4ab895c9ca am 29a6dd3c: am caaefaea: Merge "Setting MTU size for specific network" into klp-dev 
* commit '29a6dd3c8a4a410e8de7d026f001a3052b3cb221':
  Setting MTU size for specific network
 2013-10-10 21:12:02 -07:00
Vineeta Srivastava
29a6dd3c8a am caaefaea: Merge "Setting MTU size for specific network" into klp-dev 
* commit 'caaefaeab705a7c9c800670278e5c2b85ba09b28':
  Setting MTU size for specific network
 2013-10-10 21:09:59 -07:00
Vineeta Srivastava
caaefaeab7 Merge "Setting MTU size for specific network" into klp-dev 2013-10-11 04:07:58 +00:00
Adam Powell
000fa14613 am ad1d8b68: am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev 
* commit 'ad1d8b68b6286f88be510d23f7dcfa4cd6dc5b36':
  Toggle wallpaper window flag when setting custom keyguard background
 2013-10-10 20:15:13 -07:00
Adam Powell
ad1d8b68b6 am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev 
* commit '1db8cf12a985425a73d24875d9d308c14c0b4359':
  Toggle wallpaper window flag when setting custom keyguard background
 2013-10-10 20:12:40 -07:00
Adam Powell
1db8cf12a9 Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev 2013-10-11 03:09:35 +00:00
Jim Miller
0cbca14412 am 5537dc21: am bea75db9: Merge "Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing. - Hide the ch 
* commit '5537dc218234d5e7e27691ead3f22b9fbe73a36e':
  Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing. - Hide the challenge area when the camera page is settling. - Reduce jank when camera page starts snap transition. - Prevent warping from going to previous page - Smoothly blend between PagedView and Warp animations when scrolling starts.
 2013-10-10 20:07:10 -07:00
Jim Miller
5537dc2182 am bea75db9: Merge "Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing. - Hide the challenge area 
* commit 'bea75db9df6ed19c483d9a7fe86ec820d3c1484f':
  Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing. - Hide the challenge area when the camera page is settling. - Reduce jank when camera page starts snap transition. - Prevent warping from going to previous page - Smoothly blend between PagedView and Warp animations when scrolling starts.
 2013-10-10 20:05:35 -07:00
Jim Miller
bea75db9df Merge "Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing. - Hide the challenge area when the camera page is settling. - Reduce jank when camera page starts snap transition. - Prevent warping from going to previous page - Smoothly blend between PagedView and Warp animations when scrolling starts." into klp-dev 2013-10-11 03:01:49 +00:00
Adam Powell
9471907b5b Toggle wallpaper window flag when setting custom keyguard background 
Disable the wallpaper when showing a full-screen custom keyguard
background, e.g. artwork from the RemoteController. This has two nice
effects:

* The wallpaper doesn't visibly "leak" as the keyguard is dismissed
  and fades out

* We save an extra compositing/overdraw step when drawing custom
  backgrounds

Bug 11172944

Change-Id: Id635dcea6b48392f841c9c549327bccff3308c0a
 2013-10-10 20:01:49 -07:00
Aravind Akella
554069ee8c am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev 
* commit 'd18920f5c9c3f4662ceb8f729805ae06761cf108':
  Fix registerListener and flush bugs.
 2013-10-10 19:21:08 -07:00
Svetoslav
9b74a78063 am 5b8f01b6: am 466c046f: Merge "Fixing jank when transition from print dialog to generating one." into klp-dev 
* commit '5b8f01b62a09b001da4959d367fa99e46143791b':
  Fixing jank when transition from print dialog to generating one.
 2013-10-10 19:21:03 -07:00
Dianne Hackborn
7ea73db9dd am 0faf411f: am fa883071: Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 
* commit '0faf411fb494d1d7b1fbfdb0c9b45dc83a2b262c':
  Fix issue #11175600: Proc stats is aggregating stats in the wrong direction
 2013-10-10 19:20:56 -07:00
Adam Powell
7b3cdb0fb7 am 6f090af3: am ebd1dca5: Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev 
* commit '6f090af305eba51785bb9a6ec08fb9f86a73da98':
  Re-enable ActionMenuPresenter view recycling
 2013-10-10 19:20:52 -07:00
Dirk Dougherty
83fec5426a am a16ad1e9: am 384f060f: am a8914d02: am 0c74fc28: am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit 'a16ad1e9c539ed11c17b230c6036a7e178f09511':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 19:20:30 -07:00
Alan Viverette
785cda30c3 am f8c146a2: am c37db9c0: Merge "Fix layout and invalidate in SubtitleView" into klp-dev 
* commit 'f8c146a2a2e47da9326ac2ea39b7ae47b97df184':
  Fix layout and invalidate in SubtitleView
 2013-10-10 19:20:25 -07:00
Baligh Uddin
2398d205fa Import translations. DO NOT MERGE 
Change-Id: Ic4717d6c91b339b84a3c51a285bf219e230b7ae3
Auto-generated-cl: translation import
 2013-10-10 19:17:37 -07:00
Svetoslav
93e12a7c25 resolved conflicts for merge of 92aa5f4e to klp-dev-plus-aosp 
Change-Id: Ib2a3bd688256cb2e6bed13ebac01a31bd2601788
 2013-10-10 19:17:27 -07:00
Aravind Akella
d18920f5c9 am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev 
* commit 'd9b09fa97eb47b051bbfab8cc491143198fbc9bc':
  Fix registerListener and flush bugs.
 2013-10-10 19:07:42 -07:00