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

2996 Commits

Author SHA1 Message Date
Deepanshu Gupta
73b1b5a69f am c5afeb2c: am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit 'c5afeb2cbbbf762013306397507fa2059d3aaf13':
  Use right theme for drawable inflation.
 2014-10-30 23:42:52 +00:00
Craig Mautner
159da3dba8 Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225 Add enter-animation-done callback for system windows 
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
 2014-10-30 14:43:18 -07:00
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
5456230d3b am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '03b100e11dad5bef34e71ccfd45b6c7adc9bfee4':
  Add missing delegate for AnimatorInflater.
 2014-10-29 18:52:21 +00:00
Deepanshu Gupta
bf59e8974d am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit 'de4ee0f1be350a52d642a447269a91f6d28e73fc':
  Skip loading animations.
 2014-10-29 18:51:32 +00:00
Deepanshu Gupta
122ccfb08f am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit '916d779650352059b08b7257f71a7aab8b333eba':
  Fix multiple styles case in resource resolution.
 2014-10-29 18:51:28 +00:00
Deepanshu Gupta
62cf56cf99 am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit '6fb2fda85c410e23a1b9366c025fe288447bf027':
  Use right theme for drawable inflation.
 2014-10-29 18:51:23 +00:00
Deepanshu Gupta
617e809731 Add missing delegate for AnimatorInflater. 
Change-Id: I96ef2b1085dadfae280df6740aebc10f57e3b949
 2014-10-28 18:47:28 -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
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
Tim Kilbourn
7520a452a9 am a9aecc0c: Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76 automerge: 181c18e 
* commit 'a9aecc0c29ce9b9692b9b317559f83b2520dcc43':
  aapt updates for Android TV
 2014-10-25 02:35:16 +00:00
Tim Kilbourn
a9aecc0c29 Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76 
automerge: 181c18e

* commit '181c18efd438f7a5e8cc18327367c49bf51795be':
  aapt updates for Android TV
 2014-10-24 21:24:59 +00:00
Tim Kilbourn
d9b1cad71e aapt updates for Android TV 
- Output whether an app claims to be a game (android:isGame)
- Output android:banner if it is specified at the application level.

Change-Id: I7118b524f62cdfc4effeef21b32b3cdd814d9bfa
 2014-10-24 12:59:24 -07:00
Adam Lesinski
4b2a13916c am 08d1c808: Merge commit \'cd8442d4\' into manualmerge 
* commit '08d1c808477d67fe9f0a2d2ad9463998f8d54379':
  First commit of split-select tool
 2014-10-23 22:06:10 +00:00
Adam Lesinski
08d1c80847 Merge commit 'cd8442d4' into manualmerge 
Conflicts:
	tools/aapt/ResourceIdCache.cpp

Change-Id: I5341d47ed0fe891d6fefb174f644e636ce966eb8
 2014-10-23 14:55:57 -07:00
Adam Lesinski
2bf92530ee Merge "First commit of split-select tool" into lmp-mr1-dev 2014-10-23 17:54:47 +00:00
Adam Lesinski
40e8eefbed First commit of split-select tool 
This tool emits a set of rules as JSON for when a Split APK
should match a target device.

Change-Id: I8bfbdfbdb51efcfc645889dd03e1961f16e39645
 2014-10-23 10:39:31 -07:00
Deepanshu Gupta
3886d8c7a0 am c719872b: am 22387d9d: am 01c80f15: am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit 'c719872b4e4eb9329eab4ce9f3976a44e142e141':
  Check Bridge init before disposing.
 2014-10-22 21:26:58 +00:00
Deepanshu Gupta
c719872b4e am 22387d9d: am 01c80f15: am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit '22387d9d3529515e64dfc01e81f14fddb2da463c':
  Check Bridge init before disposing.
 2014-10-22 21:19:36 +00:00
Deepanshu Gupta
01c80f155d am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit '37779f07496462afa4b5d88725e8a004a7e10bc0':
  Check Bridge init before disposing.
 2014-10-22 20:47:37 +00:00
Deepanshu Gupta
568f16ccfb Merge "Check Bridge init before disposing." into lmp-dev 2014-10-22 00:57:34 +00:00
Deepanshu Gupta
eea621810c Merge "Add Optimized Line breaking to LayoutLib" 2014-10-21 22:44:38 +00:00
Deepanshu Gupta
7053919a3a Add Optimized Line breaking to LayoutLib 
Change-Id: I308a7d07d98ddd7747f16e06bcffcfd14d667534
 2014-10-21 15:43:53 -07:00
Derek Sollenberger
662d8a3688 Merge "Ensure that all requests for the Paint's nativePtr use p.getNativeInstance()" 2014-10-21 11:41:09 +00:00
Dan Albert
39e50a686a am 11d3d101: am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit '11d3d1016bf7064f0232278eb0a798dfb33ab00f':
  Fix an overflow found by ASAN.
 2014-10-20 22:05:28 +00:00
Dan Albert
11d3d1016b am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit '9295a1354eb8220be9a0a40985253c6cdfac35c3':
  Fix an overflow found by ASAN.
 2014-10-20 22:01:04 +00:00
Dan Albert
2095ed4ef6 am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit '9295a1354eb8220be9a0a40985253c6cdfac35c3':
  Fix an overflow found by ASAN.
 2014-10-20 22:01:02 +00:00
Dan Albert
9295a1354e am e40974d9: Merge "Fix an overflow found by ASAN." 
* commit 'e40974d92873462c4f1b100c7d03b3f41756c807':
  Fix an overflow found by ASAN.
 2014-10-20 21:54:41 +00:00
Dan Albert
d395f79133 Fix an overflow found by ASAN. 
Sometimes len is 0.

Change-Id: I031000188edc57663a5519b00cbbb751600d32f4
 2014-10-20 14:45:55 -07:00
Adam Lesinski
96aef34f74 am 217b17a9: am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '217b17a915849ac50f01f9097e0e35e2b21e6235':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:21:21 +00:00
Adam Lesinski
217b17a915 am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit 'd3969d927eef2f04ec097244c5f2bff5e7c0689e':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:16:17 +00:00
Adam Lesinski
6dfe03ae6c am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 21:05:04 +00:00
Adam Lesinski
3986e52cf9 am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" into lmp-dev 
* commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad':
  AAPT: Fix path for final generated resources on Windows
 2014-10-20 20:59:49 +00:00
Adam Lesinski
aff7c2447d AAPT: Fix path for final generated resources on Windows 
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
 2014-10-20 12:15:25 -07:00
Deepanshu Gupta
b69ec7708b Check Bridge init before disposing. 
In some cases ADT may dispose the Bridge even before init is called on
it. This caused an NPE. Fixed this by checking for the initialization
before disposing resources.

Bug: http://b.android.com/77726
Change-Id: I741d6ea3595a3b7cb816abd0417f23aecca6370e
 2014-10-20 11:12:53 -07:00
Adam Lesinski
815862f86f am 10db7553: am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 
* commit '10db7553ec036557032c98cdcd334b55fa1bec10':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
 2014-10-17 23:16:33 +00:00
Adam Lesinski
10db7553ec am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 
* commit 'dd64fc43a6c560d3c545132adc16cd4a079f9600':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
 2014-10-17 23:12:28 +00:00
Adam Lesinski
effd416ee3 am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 
* commit '83fae208fee402d8a6a51362f99660f9a49bd5a4':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
 2014-10-17 23:01:44 +00:00
Adam Lesinski
18d5d1107d am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 
* commit '3cd840f4b5a2988700a6b366fa32f4565c319900':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
 2014-10-17 22:55:25 +00:00
Adam Lesinski
9306a474e1 AAPT: Fix an issue where a resource name was incorrectly derived on Windows 
Calling String8::getLeaf() will assume the system's file path separator,
however the source string was already converted to a unix path.
getLeaf() would therefore not find any occurence of '\' and would
return the full path.

Bug:18036805
Change-Id: Ic2bfac0cc553406740204a296327e266b05c0eff
 2014-10-17 21:46:52 +00:00
Adam Lesinski
985adb98b6 am 7dd87312: am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 
* commit '7dd87312c9e9ee52c7c945785c6d3b274b3004b3':
  Minor resource notation/compatibility fixes
 2014-10-17 21:28:32 +00:00
Adam Lesinski
7dd87312c9 am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 
* commit '87a529c899045cf2785b86e4e289dd6c6cf56c1a':
  Minor resource notation/compatibility fixes
 2014-10-17 20:28:47 +00:00
Derek Sollenberger
f4242b107c Ensure that all requests for the Paint's nativePtr use p.getNativeInstance() 
Since requesting the native pointer triggers specific paint behavior we need
to ensure that the field is private and that callers use the public method.

Change-Id: I598a8bf2904960023397728c1ce4502ce408348e
 2014-10-17 08:22:46 -04:00