Elliott Hughes
20c3a1b47a
am 47aa51d0: am 70b74646: Merge "Track libcore changes."
...
* commit '47aa51d029b613a518a569eb798607f2fbda9330':
Track libcore changes.
2013-06-06 13:56:03 -07:00
Elliott Hughes
47aa51d029
am 70b74646: Merge "Track libcore changes."
...
* commit '70b74646b8114b7ee9e35ce4283ecab8c8528dcc':
Track libcore changes.
2013-06-06 13:53:54 -07:00
Elliott Hughes
70b74646b8
Merge "Track libcore changes."
2013-06-06 20:51:30 +00:00
John Spurlock
cd686b5b6d
Migrate systemui Slog calls to Log
...
Change-Id: Ib6734c85960f06fed646599565b8eeba26b9e98e
2013-06-06 16:40:56 -04:00
Elliott Hughes
598a16f71e
Track libcore changes.
...
Bug: 3484927
Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
2013-06-06 13:40:21 -07:00
John Spurlock
c9083f1a64
Merge "Remove remaining universe bits from sysui."
2013-06-06 20:26:59 +00:00
Scott Main
f05723350b
am c0b998d2: am 865047f8: am 6e3c1222: am 47029086: am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
...
* commit 'c0b998d295b509349f21bd12ab2e5ca34576ea8e':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-06 12:56:56 -07:00
Scott Main
c0b998d295
am 865047f8: am 6e3c1222: am 47029086: am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
...
* commit '865047f80c04a2c539d6d5052fca5436dcb7e0e3':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-06 12:54:36 -07:00
Scott Main
865047f80c
am 6e3c1222: am 47029086: am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
...
* commit '6e3c1222f06bf5b3be271a06e32d371c68fafb0e':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-06 12:51:53 -07:00
Chris Wren
29ee561d2d
Merge "reveal the notification extras"
2013-06-06 19:51:47 +00:00
Scott Main
6e3c1222f0
am 47029086: am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
...
* commit '47029086ca4fee758df1ee015d6534bd566647a1':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-06 12:49:35 -07:00
Trevor Johns
a699da6f19
Merge "docs: Fix minor typo in android.content.SyncResult"
2013-06-06 19:49:28 +00:00
Scott Main
47029086ca
am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
...
* commit '2f55af55fca237b8d675dbe5b1b7da1821d630fc':
add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-06 12:46:41 -07:00
Scott Main
2f55af55fc
add redirects for UI guideline docs,
...
as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
Change-Id: I81edd9e30e8d522adb185c8dab8d303577ef6f01
2013-06-06 12:44:16 -07:00
John Spurlock
cdc05e0014
Remove remaining universe bits from sysui.
...
The logic has been gone for a while, a few resources remained.
Change-Id: I96b85741eec1582ef0947035344eb420994690fd
2013-06-06 15:39:51 -04:00
Chris Wren
da76ad2ea3
reveal the notification extras
...
Change-Id: Ic97e3485dc23eeb5cfb565a5cef98489acdec8a2
2013-06-06 15:34:21 -04:00
Scott Main
90a603147a
am bf0abee6: am b4825b0e: am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldp
...
* commit 'bf0abee6ce8a5f4e7785efd7319cbf36b820d596':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:12:15 -07:00
Romain Guy
f69913056b
Remove unnecessary allocations
...
Change-Id: Ia561a0a312ca2737d5afa742184f5392bb2f29a3
2013-06-06 12:10:42 -07:00
Scott Main
bf0abee6ce
am b4825b0e: am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and includ
...
* commit 'b4825b0e55b71ff0aca96a560802f3355e3db5a7':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:09:56 -07:00
Scott Main
b4825b0e55
am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version,
...
* commit 'c090ce8c6f0d8c4fc176be4bb182548f11a3a13e':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:07:14 -07:00
Scott Main
c090ce8c6f
am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya k
...
* commit 'c51315674f27a12840c9e12d1ec7e0006bdba054':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:05:37 -07:00
Scott Main
c51315674f
am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony."
...
* commit '2d312a987aa768c148c16742d6ad622279fb6e42':
add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:04:03 -07:00
Scott Main
2d312a987a
Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony." into jb-mr1.1-ub-dev
2013-06-06 19:02:41 +00:00
Dianne Hackborn
5d25b18ec8
Merge "Improve debug printing in activity manager."
2013-06-06 19:01:13 +00:00
Craig Mautner
658b07f38c
Merge "Make WindowState mUnderStatusBar reflect position."
2013-06-06 18:28:57 +00:00
Craig Mautner
d76dcdcd98
Make WindowState mUnderStatusBar reflect position.
...
The mUnderStatusBar variable was always true but now it changes
when the StackBox is no longer directly under the Status Bar.
Change-Id: I0c9db5790bfa9b0e4bb35e389d539fd941d56730
2013-06-06 11:26:15 -07:00
Alan Viverette
4ea7b1c3d5
Fix mistake in current APIs.
...
Change-Id: I5f41108a2c28169c0a5433993fea5bb1b6037c5a
2013-06-06 11:06:38 -07:00
Dianne Hackborn
7ad34e5fb2
Improve debug printing in activity manager.
...
Dumping per-package data is now much cleaning, and only really
prints information related to the package. Also clean up the
formatting and such of the new activity stack states.
Change-Id: Ie5f31d72b7e77b34fd9acd835f28ed1db1dff328
2013-06-06 11:05:50 -07:00
John Spurlock
a7588e63ca
Merge "Remove a few non-public dependencies."
2013-06-06 18:00:31 +00:00
Joe Malin
195c32f774
am 7b34346d: am a2425f68: Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev
...
* commit '7b34346d483f41c1a7b444299903017c9d69eb6d':
Doc bug B9297954: Fixes to Location APIs
2013-06-06 10:55:44 -07:00
Joe Malin
7b34346d48
am a2425f68: Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev
...
* commit 'a2425f6825a88fb04f3a22e018311bf2e2a5ac4e':
Doc bug B9297954: Fixes to Location APIs
2013-06-06 10:53:36 -07:00
Dirk Dougherty
6861c488bc
am 36631b44: am 758cedd1: am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
...
* commit '36631b44f27af76e1fbd3def4b50b2cad9db0ecf':
Doc change: fix broken link to localization checklist.
2013-06-06 10:51:57 -07:00
Dirk Dougherty
36631b44f2
am 758cedd1: am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
...
* commit '758cedd116f1c6ea4b8b936a76cd77d592868209':
Doc change: fix broken link to localization checklist.
2013-06-06 10:50:04 -07:00
Joe Malin
a2425f6825
Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev
2013-06-06 17:49:27 +00:00
Dirk Dougherty
758cedd116
am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
...
* commit 'f14698551aeb57dc1952413480cb72a0c8ffb620':
Doc change: fix broken link to localization checklist.
2013-06-06 10:47:34 -07:00
Dirk Dougherty
f14698551a
am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
...
* commit '86927797869512f87e0ba6be5b83564e4a773b71':
Doc change: fix broken link to localization checklist.
2013-06-06 10:46:14 -07:00
Dirk Dougherty
8692779786
am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
...
* commit 'cf35c5e35d15f9ced64e739bd216dae7d0cbd8ae':
Doc change: fix broken link to localization checklist.
2013-06-06 10:43:34 -07:00
Dirk Dougherty
cf35c5e35d
am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
...
* commit '497584edbacb15b174901da21bc94f37528ac7d1':
Doc change: fix broken link to localization checklist.
2013-06-06 10:41:45 -07:00
Dirk Dougherty
497584edba
am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
...
* commit '16fdbd1729e9473f6176c88c59538fc5c371154f':
Doc change: fix broken link to localization checklist.
2013-06-06 10:39:22 -07:00
The Android Open Source Project
fdb2213db4
am 3fbf896c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '3fbf896c1f194c37bb49d753d7f30367a9a9c43f':
Maybe fix issue #9296868 : Crash in system process
Fix regression in long-press home behavior on tablets.
Import translations. DO NOT MERGE
Create missing Uids when recording network stats.
Import translations. DO NOT MERGE
2013-06-06 10:38:59 -07:00
The Android Open Source Project
3fbf896c1f
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I7ad4d9cdf2b0e666af7ac5791eb357703900969c
2013-06-06 10:37:18 -07:00
Chet Haase
e2b66ff085
Merge "Fix CrossFade transition"
2013-06-06 17:37:10 +00:00
Alan Viverette
b33d778e9c
Merge "Deprecate DrawableStateList.getChildren() and add getChild()."
2013-06-06 17:36:40 +00:00
Dirk Dougherty
16fdbd1729
Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
2013-06-06 17:36:29 +00:00
Chet Haase
71ce4876e5
Merge "Fix crash with LayoutTransition and ViewOverlay collision"
2013-06-06 17:35:24 +00:00
Dirk Dougherty
f4483eca3a
Doc change: fix broken link to localization checklist.
...
Change-Id: I95bb57dcc0afe4ed31f89d9d2e9b31b1a7224bc7
2013-06-06 10:34:40 -07:00
John Spurlock
8d356f37fe
Remove obsolete class from proguard.
...
Change-Id: I98acdf63c021fa7a65de068cdd96e1db421af88c
2013-06-06 13:18:24 -04:00
John Spurlock
da90337473
Remove fonts from sysui package.
...
They're obsolete, were used in HoloClock, android clock fonts are
now included in data/fonts.
Change-Id: I4ffe6d1da5760ae5ac72a1cd854550b609ba8313
2013-06-06 13:07:19 -04:00
Chris Craik
1e97ceb469
Merge "Support all formats for BitmapFactory.Options.inBitmap"
2013-06-06 16:13:30 +00:00
Craig Mautner
d0d3ca9548
Merge "Replace arrays with ArrayList"
2013-06-06 15:33:03 +00:00