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

152650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
9fa48b09ad Fix BridgeContext.get*ResourceValue() 
getFrameworkResourceValue() and getProjectResourceValue() never really
returned the defValue passed to them, instead creating a new id for
non-existent resources. We now checks for the existence of the resources
before trying to obtain the id.

Change-Id: Ie3103ba32af6186651a5f77c27d1efc33dc2bcc7
 2014-10-30 12:18:56 -07:00
Deepanshu Gupta
df0ebab0f9 Support framework menus in ActionBar 
Add support for adding menus in the framework namespace to the ActionBar
preview. If a menu id name begins with the android namespace prefix
(android:) we find the framework menu and render it.

Change-Id: If52910b46154591883af2b2f357e72eea6f84235
 2014-10-30 11:58:37 -07:00
Deepanshu Gupta
0bffc736e1 Use the right layout for inflating Action Bar. 
The choice of Action Bar layout depends on the theme. This also affects
the widget used to render the Action Bar.

Bug: http://b.android.com/77853
Change-Id: I6219a02853b4cd207a6125a5ed96fa5d16699460
 2014-10-30 11:58:37 -07:00
Deepanshu Gupta
75bf1b1c6a Merge "Skip loading animations." into lmp-dev 2014-10-29 00:13:54 +00:00
Deepanshu Gupta
c55eb170cc Merge "Fix multiple styles case in resource resolution." into lmp-dev 2014-10-29 00:07:59 +00:00
Deepanshu Gupta
92a52142fd Merge "Use right theme for drawable inflation." into lmp-dev 2014-10-29 00:07:42 +00:00
Deepanshu Gupta
0b42936d86 Skip loading animations. 
This is a temporary fix until Path.approximate() is supported.

Bug: http://b.android.com/77865
Change-Id: I28739e58f51fabaaf1dcc1c9be61cd0b17e84eec
 2014-10-28 15:07:25 -07:00
Joe Fernandez
5c0ed74b38 am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
* commit '40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
  docs: Update timing of Android Wear app review
 2014-10-28 18:15:33 +00:00
David Friedman
b2d582d995 am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
* commit '3c00bc01f9c6e82a0859201f74237998b24872da':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 18:15:28 +00:00
Eric Gilmore
9a6aa0ffa4 am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
* commit 'd126294a8f954fb758d3f67bc5271014748ba9e7':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 18:15:24 +00:00
Quddus Chong
6face8a04c am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
* commit '2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 18:15:20 +00:00
Ricardo Cervera
f4e32145a2 am 61fcad92: docs: Add SearchXonY to Common Intents 
* commit '61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
  docs: Add SearchXonY to Common Intents
 2014-10-28 18:15:17 +00:00
Deepanshu Gupta
b6444c4309 Fix multiple styles case in resource resolution. 
When multiple styles are applied to a theme, we only remembered the last
one. This change fixes the issue.

Change-Id: I46490e882edc3eabe522a641c83366234b5bb25d
 2014-10-28 11:11:10 -07:00
Deepanshu Gupta
4a605c6fa0 Use right theme for drawable inflation. 
The theme information was lost when inflating drawables. As a result,
drawables inflated in the ActionBar did not have the right tint.

Change-Id: I13d5c78039e35085ed4902289fcb735bb15d972e
 2014-10-28 11:11:09 -07:00
Joe Fernandez
40bf63e0f0 Merge "docs: Update timing of Android Wear app review" into lmp-docs 2014-10-28 03:25:40 +00:00
Joe Fernandez
a3c9be01e8 docs: Update timing of Android Wear app review 
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
 2014-10-27 20:22:52 -07:00
David Friedman
3c00bc01f9 Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 2014-10-28 02:51:32 +00:00
David Friedman
576a4b7371 Updates Notifications screenshot for Android 5.0. 
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
 2014-10-27 19:29:45 -07:00
Jason Monk
4444c5b278 Add missing passive discovery flag 
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
 2014-10-27 19:25:50 -04:00
Eric Gilmore
d126294a8f Docs: Adding Android Studio instructions for adding IAB service. 
Incorporating some editorial feedback both in and outside the
scope of my small bug fix.

Bug: 17151052
Change-Id: Id3b0c256ca6f7f018fa525eeb1f78979e8f476df
 2014-10-27 23:24:39 +00:00
Quddus Chong
2b4b3d289b cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
Change-Id: Ic7402251219a84be92d4e58863fd069de6aa4446
 2014-10-27 14:47:50 -07:00
Ying Wang
79775d4bc4 Update current.txt with generics to field types. 
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
 2014-10-27 11:25:19 -07:00
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00
Joe Fernandez
4fee8c89eb docs: Home page - fix card images that are showing up on the home page 
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
 2014-10-25 01:46:20 -07:00
Luan Nguyen
781fe92cfd Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev 2014-10-24 23:17:24 +00:00
Luan Nguyen
bfcc2e1a88 am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
  docs: fixed typo/grammar issues.
 2014-10-24 22:37:25 +00:00
Joe Fernandez
abb8ea3d4b am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
 2014-10-24 22:37:16 +00:00
Natalie Masse
60144a7a06 am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-24 22:36:54 +00:00
Luan Nguyen
9e8a84a115 docs: Fix metadata description. Add new gesture test. Split layout test. 
Change-Id: I5a8948594af94fa1e7548fc49a0c3946f03d7fc8
 2014-10-24 15:17:39 -07:00
Paul Lawrence
c220d8e57c Stop crypto UI from crashing during encryption 
Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
 2014-10-24 10:37:40 -07:00
Luan Nguyen
aec7c974eb am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit '049db36afd63b972f971f8bac6a405bc2f9437f4':
  docs: fixed typo/grammar issues.
 2014-10-24 15:59:44 +00:00
Luan Nguyen
049db36afd Merge "docs: fixed typo/grammar issues." into klp-modular-docs 2014-10-24 15:55:48 +00:00
Joe Fernandez
90f734eb18 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
  docs:Added 64-bit image note from Preview page
 2014-10-24 09:27:02 +00:00
Natalie Masse
bcf9ced47a am 1e5bb861: Link and typo fixed 
* commit '1e5bb861265072b9af555d09202e49cb38a3c4f1':
  Link and typo fixed
 2014-10-24 08:13:36 +00:00
Joe Fernandez
0e893eb7ac Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 2014-10-24 06:06:01 +00:00
Joe Fernandez
cab7338115 Merge "docs: Fix typo in search class" into lmp-dev 2014-10-24 06:01:57 +00:00
Joe Fernandez
553dd20999 Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 2014-10-24 06:00:56 +00:00
Joe Fernandez
3b6d518e79 Merge "docs: Fix hprof-conv location in docs." into lmp-dev 2014-10-24 06:00:19 +00:00
Joe Fernandez
4ae8b8f365 Merge "docs: Fixing misc minor bugs." into lmp-dev 2014-10-24 05:59:04 +00:00
Luan Nguyen
578210db19 Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 2014-10-23 22:45:03 +00:00
Luan Nguyen
912abbedee docs: Update thumbnail images for resources, update minor text for WR-GS, and 
update the title image resolution.

Change-Id: I83e89e3969bd6b837074e86a810cf801be3a6caf
 2014-10-23 13:04:29 -07:00
Trevor Johns
fb28bd158d Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 2014-10-23 16:51:39 +00:00
Trevor Johns
abcb138da8 Docs: Add TOC page for Wearable samples 
Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
 2014-10-23 09:29:05 -07:00
Ricardo Cervera
8755d9a536 Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 2014-10-23 15:10:09 +00:00
Ricardo Cervera
30d0b24280 Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 2014-10-23 15:09:42 +00:00
Joe Fernandez
7c2bfa2eae Merge "docs: Add Wear App Quality checklist" into lmp-dev 2014-10-23 07:03:16 +00:00
Luan Nguyen
9aec78cafa docs: Add Wear App Quality checklist 
Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
 2014-10-22 23:59:40 -07:00
Trevor Johns
fdb02fcf9c Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 2014-10-23 06:15:33 +00:00
Joe Fernandez
16350261e0 Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 2014-10-23 04:39:25 +00:00
Luan Nguyen
5aad2c9fb0 docs: Add article describing Location API for Android Wear. 
Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
 2014-10-22 21:36:02 -07:00