OSDN Git Service
Craig Mautner [Mon, 5 May 2014 21:03:30 +0000 (21:03 +0000)]
am
6dffeb9e: am
8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev
* commit '
6dffeb9eeba785dcf738bfabfec334a6c188d104':
Add null check to embeddedAllowed check
Ashish Sharma [Mon, 5 May 2014 20:57:07 +0000 (13:57 -0700)]
Avoid creating new battery history types because of no separator.
Change-Id: I325743142bee21e4dbca5bf9ed6135b7ca5340ec
Craig Mautner [Mon, 5 May 2014 20:59:37 +0000 (20:59 +0000)]
am
8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev
* commit '
8890013ae0473663a6b9591db6230e9038ba6711':
Add null check to embeddedAllowed check
Craig Mautner [Mon, 5 May 2014 20:55:48 +0000 (20:55 +0000)]
Merge "Add null check to embeddedAllowed check" into klp-modular-dev
Adam Powell [Mon, 5 May 2014 20:35:43 +0000 (20:35 +0000)]
Merge "Fix a bug in AbsListView nested scrolling support."
Adam Powell [Mon, 5 May 2014 20:28:22 +0000 (13:28 -0700)]
Fix a bug in AbsListView nested scrolling support.
Bug
14564701
Change-Id: I8cb854b987736e6f141610c8e6e77eb263a718db
George Mount [Mon, 5 May 2014 20:02:53 +0000 (20:02 +0000)]
Merge "Add ImageView-specific shared element activity transition code."
Alan Viverette [Mon, 5 May 2014 19:47:48 +0000 (19:47 +0000)]
Merge "Partial revert "Load device default theme mapping from resources""
John Reck [Sat, 3 May 2014 01:21:16 +0000 (18:21 -0700)]
Make RenderNodeAnimator and WebView play nice
Change-Id: Ifaefcf510b2d377663fc86f60608d6ec9be8329a
Craig Mautner [Mon, 5 May 2014 19:32:40 +0000 (12:32 -0700)]
Add null check to embeddedAllowed check
If the component being checked has been removed an NPE will be
thrown. This checks for that situation and handles it.
Fixes bug
14562234.
Change-Id: Ica5713378f356ac8441862d455b7d284ea111212
Alan Viverette [Mon, 5 May 2014 19:25:33 +0000 (12:25 -0700)]
Partial revert "Load device default theme mapping from resources"
This reverts commit
e4ab72d54cf41d16819b72e94d9b0d0d51289647.
Change-Id: Id17170312c75993fc1f7859d52c7e050b2aeaf80
George Mount [Mon, 5 May 2014 17:47:00 +0000 (10:47 -0700)]
Add ImageView-specific shared element activity transition code.
Bug
14497858
Probably more than 50% of shared elements will be ImageViews and
sharing the scale type and matrix between the two Activities will
simplify shared element transitions.
Also fixed MoveImage, which had a bug when the scale type was FIX_XY.
Change-Id: Ic5548b4d1420ced12507c18edf76c9e50e27a929
John Reck [Mon, 5 May 2014 19:21:26 +0000 (19:21 +0000)]
Merge "TIME LORD!"
Christoph Studer [Mon, 5 May 2014 19:04:56 +0000 (19:04 +0000)]
Merge changes Iffd15e95,Id2db95ec
* changes:
Log notification clicks
Add userId to StatusBarNotification key
Dianne Hackborn [Mon, 5 May 2014 18:32:03 +0000 (18:32 +0000)]
Merge "Further work on voice interaction services."
Dianne Hackborn [Fri, 2 May 2014 17:45:59 +0000 (10:45 -0700)]
Further work on voice interaction services.
This makes VoiceInteractionSession a more first-class
concept. Now the flow is that a VoiceInteractionService
calls startSession() when it wants to begin a session.
This will result in a new VoiceInteractionSession via the
VoiceInteractionSessionService containing it, and the
session at that point an decide what to do. It can now
show UI, and it is what has access to the startVoiceActivity
API.
Change-Id: Ie2b85b3020ef1206d3f44b335b128d064e8f9935
Jason Monk [Mon, 5 May 2014 18:14:26 +0000 (18:14 +0000)]
Merge "Add null check on navigation bar visibility"
Jason Monk [Mon, 5 May 2014 18:09:50 +0000 (18:09 +0000)]
Merge "Don't show IME Switcher not. if nav bar exists"
John Reck [Fri, 2 May 2014 23:46:41 +0000 (16:46 -0700)]
TIME LORD!
Bug:
14444180
Change-Id: I68bec3807c4d1c88d5af1aec2fe6907d60b5f2f3
Ruben Brunk [Mon, 5 May 2014 17:40:15 +0000 (17:40 +0000)]
Merge "camera3: Update CameraMetadata vendor tag handling."
David Friedman [Mon, 5 May 2014 17:19:14 +0000 (17:19 +0000)]
am
68e048d8: am
20d125de: am
fd876194: am
4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game developme
* commit '
68e048d85a539f1b8531f53b6192d99f0c2b1c47':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
David Friedman [Mon, 5 May 2014 17:16:22 +0000 (17:16 +0000)]
am
20d125de: am
fd876194: am
4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Rem
* commit '
20d125dedb8bde016389ee97a0cefcc97bb02a81':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
David Friedman [Mon, 5 May 2014 17:12:53 +0000 (17:12 +0000)]
am
fd876194: am
4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that
* commit '
fd876194cf12352545048f77f626c839cc7ef787':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
David Friedman [Mon, 5 May 2014 17:07:55 +0000 (17:07 +0000)]
am
4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat
* commit '
4146d546a4ab8465970e7c73bf1e9e00767931b6':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
David Friedman [Mon, 5 May 2014 17:05:22 +0000 (17:05 +0000)]
Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-docs
John Spurlock [Mon, 5 May 2014 13:24:08 +0000 (13:24 +0000)]
Merge "Log all notification interceptions."
John Spurlock [Mon, 5 May 2014 13:22:57 +0000 (09:22 -0400)]
Log all notification interceptions.
Change-Id: I036a4b5eb7c5a3ce2addb0a16d9d6806e3952929
John Spurlock [Mon, 5 May 2014 12:43:08 +0000 (08:43 -0400)]
Cleanup logspam.
Change-Id: I21b39458147e911da3ab7a260c13abf7ec4eea5d
Zhijun He [Sun, 4 May 2014 23:38:28 +0000 (23:38 +0000)]
Merge "Camera2: Minor update for hyperfocalDistance spec"
Zhijun He [Sun, 4 May 2014 23:29:57 +0000 (16:29 -0700)]
Camera2: Minor update for hyperfocalDistance spec
Doc only change.
Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71
Jinsuk Kim [Sun, 4 May 2014 23:14:57 +0000 (08:14 +0900)]
Update current.txt to fix the broken build
Change-Id: Ifaf9e2221791907b953995c5c4066528746811b3
Jinsuk Kim [Sun, 4 May 2014 21:51:42 +0000 (21:51 +0000)]
Merge "Define Feature action for obtaining info on a new CEC device"
Ruben Brunk [Sat, 22 Feb 2014 01:40:51 +0000 (17:40 -0800)]
camera3: Update CameraMetadata vendor tag handling.
Bug:
12134423
Change-Id: I19380fb5acc3e23a6181d8f858c13457993480fc
Winson Chung [Sat, 3 May 2014 01:58:10 +0000 (01:58 +0000)]
Merge "Adding ability to load a search widget into Recents."
Winson Chung [Thu, 1 May 2014 00:11:13 +0000 (17:11 -0700)]
Adding ability to load a search widget into Recents.
Change-Id: Ie17d9b9a47c979774b39a37e87f75d9dadc79ad9
Winson Chung [Sat, 3 May 2014 01:43:00 +0000 (01:43 +0000)]
Merge "Incorporating theme colors into task views."
Winson Chung [Sat, 3 May 2014 01:42:42 +0000 (01:42 +0000)]
Merge "Refactoring activity method to update recents values."
Winson Chung [Sat, 3 May 2014 01:35:35 +0000 (18:35 -0700)]
Incorporating theme colors into task views.
Change-Id: Ie7166d78dacabe4bff7afdade2d1da9d0651e403
Jose Lima [Sat, 3 May 2014 01:06:34 +0000 (01:06 +0000)]
Merge "Allow activities to be visible behind the Home Stack"
Guang Zhu [Sat, 3 May 2014 00:39:06 +0000 (00:39 +0000)]
am
9284a37d: am
1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev
* commit '
9284a37d601f8d90e868f6fb032ebb8b4e07029d':
add getAddress function to return BT mac
Adam Powell [Sat, 3 May 2014 00:36:21 +0000 (00:36 +0000)]
Merge "ListViews in ScrollViews and ScrollViews in ListViews"
Guang Zhu [Sat, 3 May 2014 00:35:26 +0000 (00:35 +0000)]
am
1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev
* commit '
1edfd835c2573711587cc77befeefd96083ccba5':
add getAddress function to return BT mac
Alan Viverette [Sat, 3 May 2014 00:35:24 +0000 (00:35 +0000)]
Merge "Fix ripple cancel"
Winson Chung [Fri, 2 May 2014 16:56:12 +0000 (09:56 -0700)]
Refactoring activity method to update recents values.
Change-Id: Ic525be207714d34abe0c2d26091c3e46abcd9bad
Guang Zhu [Sat, 3 May 2014 00:32:58 +0000 (00:32 +0000)]
Merge "add getAddress function to return BT mac" into klp-modular-dev
Ruben Brunk [Sat, 3 May 2014 00:29:00 +0000 (00:29 +0000)]
Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""
Ruben Brunk [Sat, 3 May 2014 00:28:49 +0000 (00:28 +0000)]
Revert "camera3: Update CameraMetadata vendor tag handling."
This reverts commit
e03a7eab1d08c821a516f1c07d29a77797acab68.
Change-Id: I1682b5b0904974f488d3e51c3dbaa8f9f02ac71d
Alan Viverette [Sat, 3 May 2014 00:25:05 +0000 (17:25 -0700)]
Fix ripple cancel
BUG:
14495933
Change-Id: Ie3498f35705b70e4c059ff86250cef4746f174da
Dianne Hackborn [Sat, 3 May 2014 00:24:31 +0000 (00:24 +0000)]
Merge "Bump up priority of system receiving BOOT_COMPLETED."
Adam Powell [Fri, 2 May 2014 17:04:38 +0000 (10:04 -0700)]
ListViews in ScrollViews and ScrollViews in ListViews
Dogs and cats, living together, mass hysteria!
Add support for nested scrolling to AbsListView, granting the ability
to both ListView and GridView.
Change-Id: Iae5c0518c5cebe41927720a7a27916ef13ca706e
Dianne Hackborn [Fri, 2 May 2014 23:28:33 +0000 (16:28 -0700)]
Bump up priority of system receiving BOOT_COMPLETED.
Change-Id: I5166f88f11f781914312e867cb653c8ecbefa705
Igor Murashkin [Fri, 18 Apr 2014 01:37:06 +0000 (18:37 -0700)]
camera2: Add camera-specific data types used for metadata key/value
Adds new public API classes:
* InputOutputFormatsMap
* LensShadingMap
* RggbChannelVector
* StreamConfigurationMap
* TonemapCurve
Adds new @hide classes:
* StreamConfiguration
* StreamConfigurationDuration
Minor changes:
* CameraDevice (doc only)
* Preconditions (new @hide function)
Change-Id: I2f3757e2fe9d63e710f51469c650377165fd6631
Igor Murashkin [Thu, 17 Apr 2014 21:01:13 +0000 (14:01 -0700)]
camera2: Add re-usable data types for camera metadata key/values
Adds new types to public API:
* ColorSpaceTransform
* Range<T>
* SizeF (android.util)
* MeteringRectangle
Minor changes to:
* Size (docs and move to android.util)
* Preconditions (@hide)
Adds helper class:
* HashCodeHelpers
Change-Id: Ied6749a19234f3af9da838f365f8d68d90251aaf
Ruben Brunk [Fri, 2 May 2014 22:23:29 +0000 (22:23 +0000)]
Merge "camera3: Update CameraMetadata vendor tag handling."
Deepanshu Gupta [Fri, 2 May 2014 22:17:52 +0000 (22:17 +0000)]
am
e84f6b5a: (-s ours) am
106c24fb: am
c7149708: am
bab277cc: am
13542c7e: (-s ours) am
00e0b992: am
75f435b0: am
495c14d8: (-s ours) am
47ad22ed: am
961e3281: am
6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
* commit '
e84f6b5a4ee22c1106bbf668a6d6853cfbde31d0':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:48 +0000 (22:17 +0000)]
am
db176326: (-s ours) am
2f73224c: am
b4367eaf: am
5ac33148: am
29376cea: (-s ours) am
a996ff5c: am
c529b700: am
8ad4b8b1: (-s ours) am
9932e589: am
9e2dadae: am
bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit '
db1763266dde346ed99a2f6dfac618c1b4b98c05':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:44 +0000 (22:17 +0000)]
am
85c6a654: (-s ours) am
3df2b07c: am
6241a6ce: am
eecb79a8: am
22b47b28: (-s ours) am
16fda528: am
b7431172: am
826a215c: (-s ours) am
320f1126: am
cf3f108e: am
5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
85c6a65471d5ec53a537b56de9924de866c633e3':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:39 +0000 (22:17 +0000)]
am
b8cdabb9: (-s ours) am
f9852395: am
00251f77: am
d1830eb6: am
57e410d9: (-s ours) am
9f81e73a: am
28ec8b4f: am
0a37981c: (-s ours) am
1b28d8d4: am
d642de58: am
ec4623d0: Improve text rendering and measurement. [DO NOT MERGE]
* commit '
b8cdabb990c69ae58bd184bb41f2c1d96735abd5':
Improve text rendering and measurement. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:35 +0000 (22:17 +0000)]
am
8298b7f6: (-s ours) am
8c084dde: am
6214d7aa: am
5f0fb2a1: am
4da3827f: (-s ours) am
acbff099: am
d9076a95: am
f4b35c6a: (-s ours) am
ef822b3f: am
62a4a1f9: am
2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE]
* commit '
8298b7f649063dcbe3f857c21fcb609adf74f179':
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:31 +0000 (22:17 +0000)]
am
976ee87d: (-s ours) am
9802058c: am
eec3eb86: am
c1ce1c99: am
951c6976: (-s ours) am
fcdbc3cb: am
38f954c8: am
e0537c1d: (-s ours) am
c7f8e64c: am
1830a58f: am
5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '
976ee87d9908d47bab5be7e70671170afd6cc162':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:26 +0000 (22:17 +0000)]
am
affabf47: (-s ours) am
aefb9b8b: am
73e7402e: am
7b6ab8f3: am
031f4beb: (-s ours) am
469b4aea: am
35f9f310: am
5e6a2990: (-s ours) am
4d887ec3: am
bcd50a7c: am
5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '
affabf4734fee160e36628f0631e723cb9364b76':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:22 +0000 (22:17 +0000)]
am
2c3b7d18: (-s ours) am
856e0e3a: am
02a07b73: am
20e540be: am
2d7a9c3e: (-s ours) am
c3e89c3f: am
95672929: am
73f9e467: (-s ours) am
edd67cb1: am
7c02c6e2: am
02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
2c3b7d18526ce3240d26c720e5b22c73adfe1b0a':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:18 +0000 (22:17 +0000)]
am
d3866faa: (-s ours) am
e8045e10: am
d35e28f3: am
d88cece4: am
d683d56c: (-s ours) am
35a94df7: am
ea18b2d6: am
95fd97aa: (-s ours) am
84e7a6b8: am
443372dd: am
9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
* commit '
d3866faaffbd0ca46aa070df0c844fa18b392f0b':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:14 +0000 (22:17 +0000)]
am
77f37918: (-s ours) am
c03530c1: am
b20352f5: am
33f44937: am
e9c20fd4: (-s ours) am
81f1e754: am
fd581059: am
88a12f57: (-s ours) am
43034b54: am
62591cff: am
689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
77f37918943cebf6f8cae049a7c0e01abdcf75e4':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:10 +0000 (22:17 +0000)]
am
f07a7a7a: (-s ours) am
e5a066c7: am
ad0060b5: am
1da7b0b5: am
35b16e5d: (-s ours) am
9e8ae205: am
f41ce157: am
43ed35da: (-s ours) am
ce205d0a: am
600539c7: am
083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
f07a7a7aaf9ab89ac69afae9f5c39349561c8bbe':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:07 +0000 (22:17 +0000)]
am
3f7c81ee: (-s ours) am
551ee874: am
94f1de7a: am
27c91491: am
8c54c861: (-s ours) am
2fee69e0: am
071206b4: am
aab9d9a7: (-s ours) am
1a434aa8: am
697c511d: am
80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]
* commit '
3f7c81eed4e908c4258627e79d51edd331588a52':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:17:02 +0000 (22:17 +0000)]
am
0beb2037: (-s ours) am
f07310bb: am
61c8829a: am
67da11c2: am
683e1663: (-s ours) am
79150645: am
c37f7c84: am
d15bbac6: (-s ours) am
a2b530fb: am
e39de9ae: am
6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '
0beb2037369a1d12c8c83ccfd9fa19347bef9573':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:58 +0000 (22:16 +0000)]
am
b65e5b1b: (-s ours) am
02e4ee55: am
e216cfc4: am
1e884cd0: am
543452e8: (-s ours) am
e860b24e: am
8cc1d989: am
3e9bc262: (-s ours) am
9d209905: am
6f469e54: am
11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
b65e5b1b0a90a1fe8f1ac33cbdce0c6ecc584116':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:54 +0000 (22:16 +0000)]
am
b9182c00: (-s ours) am
9748d534: am
909acf69: am
53fae496: am
dd74d6ed: (-s ours) am
042d992d: am
b22644fa: am
2bb672a2: (-s ours) am
582bb0dc: am
fbb1561a: am
44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '
b9182c00ff490b11f521861f776fd10268d69f5a':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:49 +0000 (22:16 +0000)]
am
457df2e0: (-s ours) am
e5ce95d3: am
a4d43c1f: am
1aca6e06: am
8bc5b5b6: (-s ours) am
4c3549a2: am
789f7ada: am
27f0cf0b: (-s ours) am
10fd7f6b: am
ca2c6307: am
87be67f9: Fix layoutlib [DO NOT MERGE]
* commit '
457df2e02d3294fed8472f6b0a53b55d98819e2d':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:45 +0000 (22:16 +0000)]
am
c591ecd8: (-s ours) am
ec7bd328: am
a76b37e1: am
265df035: am
cb52ff3a: (-s ours) am
efc7ec99: am
cc5e933f: am
5c7a844c: (-s ours) am
23726255: am
77d1eca7: am
7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
c591ecd849b70f00f23c6c4e3c151be98978f14b':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:34 +0000 (22:16 +0000)]
am
bc0cd97d: (-s ours) am
da4e3e40: am
d8ca6e55: am
b4d5b4f6: am
718b8028: (-s ours) am
bd532261: am
ffba5739: am
d60d0c1c: (-s ours) am
f5512973: am
fe675441: am
ce22440d: Fix text rendering [DO NOT MERGE]
* commit '
bc0cd97d8dd4fb1b5cee1f3dd4b53a32599f75c5':
Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:30 +0000 (22:16 +0000)]
am
170e427f: (-s ours) am
185c51f5: am
2f9e1769: am
a1fa08e8: am
dd7a3706: (-s ours) am
0d1d0f4b: am
519e77bb: am
44cc867f: (-s ours) am
9a1f13a4: am
afc623e3: am
bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
* commit '
170e427fb42e3159c44ac343a97da69351c1f2fb':
Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:25 +0000 (22:16 +0000)]
am
f2480d5f: (-s ours) am
18da05bc: am
d2dc1b09: am
767df122: am
8b95eb0b: (-s ours) am
1ae98755: am
64d1c57a: am
11976058: (-s ours) am
b80247d3: am
811b331a: am
d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
f2480d5f97c83c1fee9f94823f3d3773996df173':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:19 +0000 (22:16 +0000)]
am
6343490a: (-s ours) am
217f182a: am
e73e005b: am
ba09a379: am
05fea8bf: (-s ours) am
779972f1: am
175a1e60: am
e821d0cc: (-s ours) am
b27d8814: am
21cf9843: am
d1084cc0: Add missing native methods. [DO NOT MERGE]
* commit '
6343490a80059a6c31af80de8d8b719b228df771':
Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:15 +0000 (22:16 +0000)]
am
090e3b54: (-s ours) am
99879842: am
3d564043: am
7b5a7434: am
288d32b9: (-s ours) am
17e0eebd: am
465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
090e3b5437b6e15c99b743672542991326c00b16':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:10 +0000 (22:16 +0000)]
am
9b8602d5: (-s ours) am
0ec21781: am
7c6c49b0: am
4c3e5340: am
e4fe8556: (-s ours) am
bb1d24d7: am
b5cdfd97: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '
9b8602d5112d4c2c45f986b27ee6b190fd48d11e':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:06 +0000 (22:16 +0000)]
am
79ee53ec: (-s ours) am
0ae06aa6: am
8328a237: am
78317c44: am
5a94ac62: (-s ours) am
63a6de79: am
20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '
79ee53eca98fae132d0954a804d04696b8afc95c':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:16:01 +0000 (22:16 +0000)]
am
9cd37b6c: (-s ours) am
fe37951a: am
5f7dca92: am
214af0ad: am
cebf9605: (-s ours) am
9b1c46df: am
3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '
9cd37b6c2f170083d5cd029ee28533b6e381be35':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:15:57 +0000 (22:15 +0000)]
am
a4bd1ede: (-s ours) am
55249cd3: am
8e9a3715: am
c4f6a8de: am
3cb97ec7: (-s ours) am
7c3a40b6: am
b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE]
* commit '
a4bd1eded41b10bc46e78893fd5d5e21913983cf':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:15:53 +0000 (22:15 +0000)]
am
ff100469: (-s ours) am
ba384982: am
63e91b36: am
e57487be: am
500a3139: (-s ours) am
7a0985ec: am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
ff10046913c4775f67816d1208b6fc653e4e3d72':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:15:49 +0000 (22:15 +0000)]
am
1947774f: (-s ours) am
9cb7350a: am
b6de19b7: am
05d791c3: am
efa617f9: (-s ours) am
15994863: am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
1947774fa9dd2ee883bc77d8dac09dd969a66abf':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 22:15:43 +0000 (22:15 +0000)]
am
8f1b44eb: (-s ours) am
6b6c1b01: am
b971bae3: am
2800200d: am
a9b296a5: (-s ours) am
edd048fb: am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
8f1b44eb97acb257beaf3511f8f1af1972f91cce':
Remove references to java package class Objects. [DO NOT MERGE]
Michael Wright [Fri, 2 May 2014 22:15:06 +0000 (22:15 +0000)]
am
e8628797: am
09446329: am
52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."
* commit '
e8628797833dfab1319d7a17f9ff465de760c633':
Map KEY_APPSELECT to APP_SWITCH.
Selim Gurun [Fri, 2 May 2014 21:54:30 +0000 (21:54 +0000)]
Merge "Add an import missing"
Selim Gurun [Fri, 2 May 2014 21:52:49 +0000 (14:52 -0700)]
Add an import missing
Change-Id: I99a15779bff3bae5dd78d823d1f6c7f644c98751
Selim Gurun [Fri, 2 May 2014 21:47:46 +0000 (21:47 +0000)]
Merge "Fix javadoc breakage"
Selim Gurun [Fri, 2 May 2014 21:40:41 +0000 (14:40 -0700)]
Fix javadoc breakage
Change-Id: I2667bdb6b4ea76c2f81bae77ceaecb3391e4521b
John Reck [Fri, 2 May 2014 21:36:57 +0000 (21:36 +0000)]
Merge "Allow starting an RT animation via Canvas"
Selim Gurun [Fri, 2 May 2014 21:34:24 +0000 (21:34 +0000)]
Merge "Unhide Client Cert APIS"
John Reck [Fri, 2 May 2014 21:20:53 +0000 (14:20 -0700)]
Allow starting an RT animation via Canvas
Change-Id: I8b105a01cf28ad03797b63347343f6b999d46386
Alan Viverette [Fri, 2 May 2014 21:28:37 +0000 (21:28 +0000)]
Merge "Theme colors for legacy, Holo"
Selim Gurun [Fri, 2 May 2014 21:15:07 +0000 (14:15 -0700)]
Unhide Client Cert APIS
Bug:
12983007
Change-Id: I9ae23be110ff036ce64271841e1ba69122ce6caa
Dianne Hackborn [Fri, 2 May 2014 21:08:53 +0000 (21:08 +0000)]
Merge "Change wake reason checkin tag to "wr"."
Amith Yamasani [Fri, 2 May 2014 20:58:54 +0000 (20:58 +0000)]
Merge "Send ACTION_MANAGED_PROFILE_REMOVED broadcast."
Selim Gurun [Fri, 2 May 2014 20:56:44 +0000 (20:56 +0000)]
Merge "Design a static API for clearclientcertpreferences"
Dianne Hackborn [Fri, 2 May 2014 20:49:30 +0000 (13:49 -0700)]
Change wake reason checkin tag to "wr".
The old "Wr" was also used for Wifi Running.
Also include discharge/charge time remaining in
checkin output.
Change-Id: I303a0be902002d0399b9eb76773857da9103e8ce
Adam Connors [Mon, 14 Apr 2014 10:58:10 +0000 (11:58 +0100)]
Send ACTION_MANAGED_PROFILE_REMOVED broadcast.
When the managed profile is removed, this new intent
is used to inform the rest of the system.
Change-Id: I1748bed0a7ee0122f69d5c78235a79f8e205efec
John Reck [Fri, 2 May 2014 20:48:26 +0000 (20:48 +0000)]
Merge "Add CanvasProperty for drawCircle"
John Reck [Fri, 2 May 2014 04:27:37 +0000 (21:27 -0700)]
Add CanvasProperty for drawCircle
Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
OSDN Git Service
