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

117115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
887ee5a0b5 am 3a7907be: (-s ours) am 3cf39ba8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '3a7907be474832b33b1cfc30f7e38968d4dea38f':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:31 -07:00
Baligh Uddin
71cd5e7818 am 64f043da: (-s ours) am e4e6a4f3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '64f043da26b75e46cf8099f9018e7e97a1016075':
  Import translations. DO NOT MERGE
 2013-10-11 08:15:28 -07:00
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
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
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
9aa75f29a6 am ccfd6f44: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ccfd6f44f487edb8cdd33731ec1f001bf9e1a913':
  Import translations. DO NOT MERGE
 2013-10-11 08:11:24 -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
e2835bc6b4 Merge "Import translations. DO NOT MERGE" 2013-10-11 15:09:16 +00:00
Baligh Uddin
3cf39ba82a Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-11 15:09:11 +00:00
Baligh Uddin
ccfd6f44f4 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:09:06 +00:00
Baligh Uddin
7ba8a7177a Merge "Import translations. DO NOT MERGE" 2013-10-11 15:09:02 +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
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
491ad45fee Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:08:39 +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
d32e9b7ffb Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:08:10 +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
29cff85287 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:07:57 +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
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
Torne (Richard Coles)
740753c5b4 Add internal resource symbol used by WebViewChromium. 
The Chromium WebView needs access to the default <video> tag poster
image, which is a framework resource. Add to the list of internal
resource symbols.

Bug: 11158656
Change-Id: I0c9ca7c25fe4c9a970b9e336ff72eda55637c201
 2013-10-11 15:47:06 +01: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
Craig Mautner
2881630af9 Reduce jank on incoming phone call during dream. 
- Include dreams in the conditions that disable transition animations.
  This way there is no visibility of activities that are closing
  behind the keyguard when an activity that dismisses the keyguard
  starts up.

- Do not notify the keyguard mediator when the keyguard is dismissed
  because a dream is starting up. This keeps activities from resuming
  just because the keyguard is being dismissed.

Fixes bug 11064847.

Change-Id: I9d32fc96d518b1cdab511e187226a3cb889cf6d4
 2013-10-10 20:31:00 -07: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