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

116430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
9c00a2f304 Update qs asset outlines. 
Bug:10641374
Change-Id: Id4748cf72b4c8c3c59797fc4880926cb4fe57b74
 2013-10-07 12:39:18 -04:00
Baligh Uddin
3a6b3c1660 Import translations. DO NOT MERGE 
Change-Id: I0f7fb0ae37941f52c70614f256f0bde0316824dd
Auto-generated-cl: translation import
 2013-10-07 09:30:04 -07:00
Baligh Uddin
194d77057b Import translations. DO NOT MERGE 
Change-Id: If41d11e80795a7cac5627f484d84b4c48e7ad956
Auto-generated-cl: translation import
 2013-10-07 09:28:05 -07:00
Baligh Uddin
5c3144b1d5 Import translations. DO NOT MERGE 
Change-Id: Ib5f0a7090f91814f9c5df7da7e96fe492cef100a
Auto-generated-cl: translation import
 2013-10-07 09:26:23 -07:00
John Spurlock
3f7cd517aa Fix transparent -> translucent reference in private docs. 
Bug:10781433
Change-Id: I9e71b38df3909c367c80a9a589d28f703d1c9936
 2013-10-07 12:25:09 -04:00
Baligh Uddin
8a4bd3ab3d Import translations. DO NOT MERGE 
Change-Id: Ic6acf9da0bedd418f4fb9b30e5ee08058a676736
Auto-generated-cl: translation import
 2013-10-07 09:23:18 -07:00
Baligh Uddin
a5ea69ff28 Import translations. DO NOT MERGE 
Change-Id: Ie31c027871b65270af282ba9253c35be93d7490d
Auto-generated-cl: translation import
 2013-10-07 09:22:06 -07:00
Baligh Uddin
a44c31bda0 Import translations. DO NOT MERGE 
Change-Id: I107cb20c67c52a5d2c6d82cb31f5ac41a75cdf4d
Auto-generated-cl: translation import
 2013-10-07 09:20:44 -07:00
Zhijun He
b7bfdc7cf7 Camera2: add metadata override 
There are interface difference between managed and native side for some
metadata, like Face and JPEG format. we need override them when they are set/get
between native and managed sides.

Also fix some issues in the CameraMetadataTest.

Bug: 10406212

Change-Id: Ibd8be0415968445e711b3ea89f45e1edfa193ee2
 2013-10-07 08:02:25 -07:00
Daniel Sandler
6071c3dcf6 Fix build. 
API changes in patch bd95740648372449a4d5c164d7050eee352d4c24
(change If667a55b merged from klp-dev) conflicted with
aaca5d888a0dfdb6f9b7fdb6a6cf34f6a23ef68b (change I7c22c1ff).

Change-Id: I477d088f22aa80fc37a9ac78834bfcb5c11922ca
 2013-10-07 01:28:57 -04:00
Svetoslav Ganov
b2420c917b The undefined media sizes for both orientations not properly constructed. 
We have constants for an app to specify an undefined media size in portrait
and such in landscape. The constants for these media sizes had the width and
height dimesions swapped.

bug:11099831

Change-Id: Ic09227c3a03429fc5a4a157abc15fea87d3ad8be
 2013-10-06 19:44:19 -07:00
John Spurlock
13431ad822 am 4818db0f: am b88ede00: am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 
* commit '4818db0fc5dec465a2cdb76c0faff4750a3a3fff':
  Transparent system ui flags -> Translucent WM flags.
 2013-10-06 19:22:46 -07:00
John Spurlock
4818db0fc5 am b88ede00: am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 
* commit 'b88ede00ac12fb359b490a5167cd595ebde7e805':
  Transparent system ui flags -> Translucent WM flags.
 2013-10-06 19:19:18 -07:00
John Spurlock
b88ede00ac am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 
* commit 'd5102f19653f6b00ce872435c5efb5cb630deed7':
  Transparent system ui flags -> Translucent WM flags.
 2013-10-06 19:16:13 -07:00
John Spurlock
d5102f1965 Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 2013-10-07 02:13:50 +00:00
Svetoslav Ganov
5b9c63886c am d64d41b3: am 719e486f: am 9470cd95: Merge "Polish print dialog accessibility." into klp-dev 
* commit 'd64d41b3345aefd1a73512944e33a38d29d9b15c':
  Polish print dialog accessibility.
 2013-10-06 18:34:47 -07:00
Svetoslav Ganov
f035c92ee5 am 016e163f: am 13c64b1d: am 253b628d: Merge "Update all printers activity\'s empty state and avoid selected printer flicker." into klp-dev 
* commit '016e163f301158c5a0243830e7517866e7d14cc5':
  Update all printers activity's empty state and avoid selected printer flicker.
 2013-10-06 18:34:43 -07:00
Svetoslav Ganov
0168a25414 am f3f27382: am f2bbe037: am 589a5505: Merge "Update the empty state for the "all printers activity"" into klp-dev 
* commit 'f3f27382830d29d0ba045f5c2680e2f6831ae274':
  Update the empty state for the "all printers activity"
 2013-10-06 18:34:39 -07:00
Svetoslav Ganov
a4b913aa10 am 22df192a: am 455def39: am a99cedc6: Merge "Update the "add print service" dialog as per UX spec." into klp-dev 
* commit '22df192aaf1875ebd534dfc0523b9012cee61eac':
  Update the "add print service" dialog as per UX spec.
 2013-10-06 18:34:36 -07:00
Svetoslav Ganov
d64d41b334 am 719e486f: am 9470cd95: Merge "Polish print dialog accessibility." into klp-dev 
* commit '719e486f54b668d13680552f96558ee30d220a00':
  Polish print dialog accessibility.
 2013-10-06 18:32:31 -07:00
Svetoslav Ganov
016e163f30 am 13c64b1d: am 253b628d: Merge "Update all printers activity\'s empty state and avoid selected printer flicker." into klp-dev 
* commit '13c64b1d957b65a0cc0fc8e9ac8963b4e850baad':
  Update all printers activity's empty state and avoid selected printer flicker.
 2013-10-06 18:32:28 -07:00
Svetoslav Ganov
f3f2738283 am f2bbe037: am 589a5505: Merge "Update the empty state for the "all printers activity"" into klp-dev 
* commit 'f2bbe03726df6dd24a34444ec3a583bf1f23d886':
  Update the empty state for the "all printers activity"
 2013-10-06 18:32:25 -07:00
Svetoslav Ganov
22df192aaf am 455def39: am a99cedc6: Merge "Update the "add print service" dialog as per UX spec." into klp-dev 
* commit '455def3967109c7553625bc0985c0699057afcb2':
  Update the "add print service" dialog as per UX spec.
 2013-10-06 18:32:22 -07:00
Svetoslav Ganov
719e486f54 am 9470cd95: Merge "Polish print dialog accessibility." into klp-dev 
* commit '9470cd95dcf691eec33839065948bd32aab06fc6':
  Polish print dialog accessibility.
 2013-10-06 18:29:32 -07:00
Svetoslav Ganov
13c64b1d95 am 253b628d: Merge "Update all printers activity\'s empty state and avoid selected printer flicker." into klp-dev 
* commit '253b628dac59c431e2c73c8f17fa14976d78db2c':
  Update all printers activity's empty state and avoid selected printer flicker.
 2013-10-06 18:29:29 -07:00
Svetoslav Ganov
f2bbe03726 am 589a5505: Merge "Update the empty state for the "all printers activity"" into klp-dev 
* commit '589a550596eea6deda1aa0701fb73f5c4fa4769d':
  Update the empty state for the "all printers activity"
 2013-10-06 18:29:27 -07:00
Svetoslav Ganov
455def3967 am a99cedc6: Merge "Update the "add print service" dialog as per UX spec." into klp-dev 
* commit 'a99cedc6b8d58a1b4856b0cc8c9fa568a90466bd':
  Update the "add print service" dialog as per UX spec.
 2013-10-06 18:29:24 -07:00
Svetoslav Ganov
9470cd95dc Merge "Polish print dialog accessibility." into klp-dev 2013-10-07 01:27:40 +00:00
Svetoslav Ganov
253b628dac Merge "Update all printers activity's empty state and avoid selected printer flicker." into klp-dev 2013-10-07 01:27:28 +00:00
Svetoslav Ganov
589a550596 Merge "Update the empty state for the "all printers activity"" into klp-dev 2013-10-07 01:27:01 +00:00
Svetoslav Ganov
a99cedc6b8 Merge "Update the "add print service" dialog as per UX spec." into klp-dev 2013-10-07 01:26:31 +00:00
Robert Greenwalt
a48126fa19 am df3dea9c: (-s ours) am 81d1af26: am 65d949d7: am 458430d8: (-s ours) am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo 
* commit 'df3dea9cc3c6add3f8abcf5217de34c5660c66e5':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-06 18:24:27 -07:00
Robert Greenwalt
21e8951eb9 am cad9b715: (-s ours) am 8070ffcc: am 97ac7132: am 0e591c28: (-s ours) am 8098bfac: am dd8e315b: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo 
* commit 'cad9b715924cc2c38caf15ed676200d24a8ced02':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-06 18:24:24 -07:00
Craig Mautner
994f407cc1 am d99f9854: am 6b027cc7: am e7dd3469: Merge "Relax conditions for including windows behind dialogs" into klp-dev 
* commit 'd99f9854e21b15af2ea9226d35c3662e3c542ce8':
  Relax conditions for including windows behind dialogs
 2013-10-06 18:24:20 -07:00
Craig Mautner
1f29fc18fb am 1a205e9a: am 846a482a: am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev 
* commit '1a205e9a0c2587ec603d88e954bd89ca0c957e7a':
  Revert to jb-mr2 handling of app died.
 2013-10-06 18:24:17 -07:00
Christopher Tate
20e85d252c am 12c0b66f: am a5c43674: am eb09f990: Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev 
* commit '12c0b66fcecee7671a2cf3e28fddfb9cfa0c679d':
  Make sure to maintain privilege when downgrading bundled apps
 2013-10-06 18:24:13 -07:00
Dianne Hackborn
91b5ab00d1 am c9d48121: am 7ac5a9ac: am 4bc5909a: Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev 
* commit 'c9d481218b23ff72922ddc6bbc006be971ff252f':
  Fix issue #11050678: Large memory leak in ActivityStack
 2013-10-06 18:24:06 -07:00
Dianne Hackborn
a74bbf0694 am 0fa2673e: am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev 
* commit '0fa2673e9b9ccabdaa1837b5e6ec0b91c75d1a89':
  Fix issue #11086275: Thumbnail only created once for top activity
 2013-10-06 18:24:02 -07:00
Chet Haase
56211d2c0f am cdd59f0e: am e849cc1b: am febf33fe: Merge "Fix resource-loading code for TransitionSet" into klp-dev 
* commit 'cdd59f0e6040ccf6904eef7df0ce8cc5509133d8':
  Fix resource-loading code for TransitionSet
 2013-10-06 18:23:59 -07:00
Craig Mautner
46d0aab6a1 am 6ebd6cb6: am c50738d6: am dd88879c: Merge "Evaluate task on top of home when task is brought to front." into klp-dev 
* commit '6ebd6cb673f5c3e432c1e92d6aec7ce47ecdd2cf':
  Evaluate task on top of home when task is brought to front.
 2013-10-06 18:23:53 -07:00
Craig Mautner
02a4e7330f am 2478281d: am 3cb25e91: am 1703fd87: Merge "Resume user where they left off." into klp-dev 
* commit '2478281de362c86825cd93d6395af4197d1adb73':
  Resume user where they left off.
 2013-10-06 18:23:49 -07:00
Christopher Tate
b2bb7ddebe am 2aa93138: am e67ebcbc: am 4b4ad011: Merge "Notify that ASEC containers are being unmounted during upgrades" into klp-dev 
* commit '2aa931380b759ec45602dd560aa4d4170ea93330':
  Notify that ASEC containers are being unmounted during upgrades
 2013-10-06 18:23:45 -07:00
Jim Miller
18ac0d7741 am 143f2e4c: am 1654f847: am 158fbd3a: Fix bug where pebble app triggers accessibility mode in navbar camera 
* commit '143f2e4c5c33d4cedf8dfa667f990e3957ee53f5':
  Fix bug where pebble app triggers accessibility mode in navbar camera
 2013-10-06 18:23:41 -07:00
Robert Greenwalt
df3dea9cc3 am 81d1af26: am 65d949d7: am 458430d8: (-s ours) am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo 
* commit '81d1af2605f43a8f6722371a8d3f2d0f81a8d5f2':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-06 18:19:12 -07:00
Robert Greenwalt
cad9b71592 am 8070ffcc: am 97ac7132: am 0e591c28: (-s ours) am 8098bfac: am dd8e315b: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo 
* commit '8070ffccbbb55721edd4ac014d6a675439a9926e':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-06 18:19:09 -07:00
Craig Mautner
d99f9854e2 am 6b027cc7: am e7dd3469: Merge "Relax conditions for including windows behind dialogs" into klp-dev 
* commit '6b027cc713659bbe2127c83fe8bc14e66a163727':
  Relax conditions for including windows behind dialogs
 2013-10-06 18:19:06 -07:00
Craig Mautner
1a205e9a0c am 846a482a: am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev 
* commit '846a482a0d891a799bfd6e9b00ed5b401a791b30':
  Revert to jb-mr2 handling of app died.
 2013-10-06 18:19:03 -07:00
Christopher Tate
12c0b66fce am a5c43674: am eb09f990: Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev 
* commit 'a5c436743c2d0343550d13f16ae557d4ea6101e1':
  Make sure to maintain privilege when downgrading bundled apps
 2013-10-06 18:19:01 -07:00
Dianne Hackborn
c9d481218b am 7ac5a9ac: am 4bc5909a: Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev 
* commit '7ac5a9acb8c110620eac04db1eabecbbf64c0744':
  Fix issue #11050678: Large memory leak in ActivityStack
 2013-10-06 18:18:58 -07:00
Dianne Hackborn
0fa2673e9b am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev 
* commit 'ae828e869f1cc7506bc0d9329007c6fb990de39f':
  Fix issue #11086275: Thumbnail only created once for top activity
 2013-10-06 18:18:55 -07:00