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

116982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
5e9a9fa037 am fbd88579: (-s ours) am d52cfad3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'fbd88579a6f23c9fa0685adbef61596980ab09d1':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:25 -07:00
Baligh Uddin
7d77fbc2a2 am dbea9992: (-s ours) am 57612468: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'dbea999257be42be3a99f3a57ee2c11e821c3a5d':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:21 -07:00
Baligh Uddin
ca20902916 am ba3b6a37: (-s ours) am 40705a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'ba3b6a376658313e76b76e0989222fe0884e7247':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:17 -07:00
Baligh Uddin
e8c97617dd am f6644d81: (-s ours) am 829b3dfa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'f6644d81f3978b666fb0d60f78ff80f96a6cf352':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:14 -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
Daniel Sandler
35c01fe115 am bc1efa92: am 3b4e1c0a: am 26b49a7d: Merge "Be sure to update the display metrics on config change." into klp-dev 
* commit 'bc1efa92c455ff3b48b5e14cc6eda7f9f76058f6':
  Be sure to update the display metrics on config change.
 2013-10-11 08:11:35 -07:00
Baligh Uddin
e2835bc6b4 Merge "Import translations. DO NOT MERGE" 2013-10-11 15:09:16 +00:00
Baligh Uddin
7ba8a7177a Merge "Import translations. DO NOT MERGE" 2013-10-11 15:09:02 +00:00
Baligh Uddin
f87aac1b32 Merge "Import translations. DO NOT MERGE" 2013-10-11 15:08:48 +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
260c29d0f0 Merge "Import translations. DO NOT MERGE" 2013-10-11 15:08:35 +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
eb175e03ac Merge "Import translations. DO NOT MERGE" 2013-10-11 15:08:05 +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
7ee62b6a09 Merge "Import translations. DO NOT MERGE" 2013-10-11 15:07:51 +00:00
Baligh Uddin
829b3dfae0 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:07:47 +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
Narayan Kamath
6e86fa8a6b Fix WifiInfo#getHiddenSSID 
The method would previously always return false.

Note that this is the simplest fix, and not the most
optimal fix. That said, in this change, a call to
WifiInfo#getHiddenSSID costs the same as a call to
WifiInfo#getSSID, so it isn't that bad.

bug: 10705138
Change-Id: I980563fd8a5bafe8c58c586449e778a0aa8b58a4
 2013-10-11 10:11:14 +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
81a80651b4 am 4ab895c9: am 29a6dd3c: am caaefaea: Merge "Setting MTU size for specific network" into klp-dev 
* commit '4ab895c9cac4b582cc51f1c37bb1b2233808691f':
  Setting MTU size for specific network
 2013-10-10 21:15:49 -07: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
59bb250510 am 000fa146: am ad1d8b68: am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev 
* commit '000fa14613995d830022bccc2cc573653258b725':
  Toggle wallpaper window flag when setting custom keyguard background
 2013-10-10 20:16:52 -07: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
dec5ca0d82 am 0cbca144: 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. 
* commit '0cbca144127f4db8f13f09cfe3b1837d1145e174':
  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:08:45 -07: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
986481d52a am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev 
* commit '554069ee8c3a0c06d0849d198325eda9c0128097':
  Fix registerListener and flush bugs.
 2013-10-10 19:27:03 -07:00
Svetoslav
d1810e3931 am 9b74a780: am 5b8f01b6: am 466c046f: Merge "Fixing jank when transition from print dialog to generating one." into klp-dev 
* commit '9b74a78063707c45ffd1a173de51e215fd7e53b4':
  Fixing jank when transition from print dialog to generating one.
 2013-10-10 19:27:00 -07:00
Dianne Hackborn
ba7d4a5866 am 7ea73db9: am 0faf411f: am fa883071: Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 
* commit '7ea73db9ddcb9ce33480a21834d6f99a9d1b141d':
  Fix issue #11175600: Proc stats is aggregating stats in the wrong direction
 2013-10-10 19:26:56 -07:00
Adam Powell
d2d0b5843d am 7b3cdb0f: am 6f090af3: am ebd1dca5: Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev 
* commit '7b3cdb0fb7cd7fab647de09e6a64ce59555ed733':
  Re-enable ActionMenuPresenter view recycling
 2013-10-10 19:26:52 -07:00
Dirk Dougherty
4a65773d81 am 83fec542: 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 '83fec5426a96af3147c2ba87c2e72b9b0e3ab108':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 19:26:48 -07:00
Alan Viverette
9845b38279 am 785cda30: am f8c146a2: am c37db9c0: Merge "Fix layout and invalidate in SubtitleView" into klp-dev 
* commit '785cda30c35aefa90fd89adef0e71fa41fd3459c':
  Fix layout and invalidate in SubtitleView
 2013-10-10 19:26:42 -07:00
Svetoslav
518fb915d2 resolved conflicts for merge of 93e12a7c to master 
Change-Id: I94b488bdfce77c5f0708f5ccdced6800aa939785
 2013-10-10 19:24:32 -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