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

2870 Commits

Author SHA1 Message Date
Adam Lesinski
a86d26acc5 am c953898b: Fix issues that occurred due to building with clang 
* commit 'c953898b983d70658e0decf19f48fff3ac462cf7':
  Fix issues that occurred due to building with clang
 2014-11-04 05:04:16 +00:00
Adam Lesinski
c953898b98 Fix issues that occurred due to building with clang 
Change-Id: I4fb3eb1c8d2a02312deaeebf4a0627153bf8700a
 2014-11-03 20:58:35 -08:00
Adam Lesinski
7913cf9da6 am 8a5bb15e: Fix automerge issue 
* commit '8a5bb15efaa55ff57a92e36d2b9e33d1f34c9608':
  Fix automerge issue
 2014-11-04 04:43:04 +00:00
Adam Lesinski
8a5bb15efa Fix automerge issue 
Duplicate method declaration.

Change-Id: I9355bd7c716e668ad7892fd12e93352455d149b5
 2014-11-03 20:35:54 -08:00
Adam Lesinski
2bea99c033 am b2808c03: Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp 
* commit 'b2808c03c3de0d4fe6a986545fd506df0233b072':
  Fix build due to bad merge
 2014-11-04 03:42:26 +00:00
Adam Lesinski
b2808c03c3 Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp 2014-11-04 03:37:50 +00:00
Deepanshu Gupta
85c6637344 am b490d5d3: am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001 
* commit 'b490d5d3ece9b0617feacd71e4b2a85a0e1b26a8':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 02:59:38 +00:00
Deepanshu Gupta
a2ccfb386a am 9549824d: am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae 
* commit '9549824d2b7363b69d9ccc529dabf0d608b1ab39':
  Support framework menus in ActionBar
 2014-11-04 02:59:31 +00:00
Deepanshu Gupta
0ad1eb3349 am 837e65be: am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 
* commit '837e65be0d7259bdc122c19676f9ad0b711b000f':
  Use the right layout for inflating Action Bar.
 2014-11-04 02:59:26 +00:00
Deepanshu Gupta
b490d5d3ec am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001 
* commit '0267541c90a33c2558d93a0250791ac8fb679688':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 02:50:24 +00:00
Deepanshu Gupta
9549824d2b am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae 
* commit '6479282ef584285a2da4d3750acec5ce7d13b6bb':
  Support framework menus in ActionBar
 2014-11-04 02:50:18 +00:00
Deepanshu Gupta
837e65be0d am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763 
* commit 'a36980980886a645627542a7bcabf0d718ea79c9':
  Use the right layout for inflating Action Bar.
 2014-11-04 02:50:10 +00:00
Adam Lesinski
0cc963c663 Fix build due to bad merge 
- tools/aapt/qsort_r_compat.c was removed
  and the merge added it back to the src list in Android.mk

Change-Id: I15aae8adc68f82ac2381020ac0b96a7b1ab59f9c
 2014-11-03 18:37:49 -08:00
Adam Lesinski
cdd11d7a60 am 4dfff4e7: am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit '4dfff4e7276ef98e4c5b84ef715b75a80b01f5c7':
  Build the split-select tool without C++11 support
 2014-11-04 02:28:03 +00:00
Adam Lesinski
4dfff4e727 am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 
* commit '5fa9021822577f1e4676db49a6b5cb5d36e4614a':
  Build the split-select tool without C++11 support
 2014-11-04 02:20:47 +00:00
Adam Lesinski
24655f37ed am 3fd34002: Merge commit \'78be0498\' into manualmerge 
* commit '3fd340028fc24198edb23ddf5eb5a0a100bab745':
  Fix issues that will be present in C++11
 2014-11-04 02:14:37 +00:00
Adam Lesinski
3fd340028f Merge commit '78be0498' into manualmerge 
Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
 2014-11-03 18:06:22 -08:00
Deepanshu Gupta
fef500107e am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 
* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 01:08:43 +00:00
Deepanshu Gupta
9a6d8ae255 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a 
* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar
 2014-11-04 01:08:39 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:08:23 +00:00
Deepanshu Gupta
0a2e42d4af Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 00:51:51 +00:00
Deepanshu Gupta
33996b9878 Merge "Support framework menus in ActionBar" into lmp-dev 
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar
 2014-11-04 00:50:48 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev 
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
 2014-11-04 00:49:43 +00:00
Adam Lesinski
f7ffcaa7a4 Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 2014-11-03 23:38:56 +00:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Deepanshu Gupta
9b64954cb5 Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 2014-11-03 23:15:03 +00:00
Deepanshu Gupta
c23487aa18 Merge "Support framework menus in ActionBar" into lmp-dev 2014-11-03 23:14:46 +00:00
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
Adam Lesinski
c3dc0b57b8 Build the split-select tool without C++11 support 
It was complicated to get the tool building on Windows, Linux,
and OSX with C++11 support.

OSX uses Clang to build C++11 binaries, which requires the libc++
standard library. Since most of the dependencies of this program
are built against libstdc++, this was difficult to resolve.

Now we build without C++11 support.

Change-Id: I4e537c113734508a8f480a1c402ed237de4f0e60
 2014-11-03 12:09:58 -08:00
Adam Lesinski
4bf58108d4 Fix issues that will be present in C++11 
- char16_t is a distinct type, so stay consistent
  with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
  Since we mmap and cast data structures onto raw memory,
  we need a precise definition (uint16_t), so we cast between
  that (and static_assert that they are the same size).

Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
 2014-11-03 11:49:47 -08:00
Jeff Brown
b3d18f2c2e am 5177979b: am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e automerge: a80162f 
* commit '5177979bbd7459179648057ba00a6399aeb26357':
  Add a function to boost screen brightness temporarily.
 2014-11-01 17:51:16 +00:00
Jeff Brown
5177979bbd am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e 
automerge: a80162f

* commit 'a80162f0d124e7400e268440c864289a9a7be11e':
  Add a function to boost screen brightness temporarily.
 2014-11-01 15:04:52 +00:00
Jeff Brown
0ed053ef53 am e333e674: Add a function to boost screen brightness temporarily. 
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
  Add a function to boost screen brightness temporarily.
 2014-11-01 14:10:46 +00:00
Jeff Brown
e333e674a7 Add a function to boost screen brightness temporarily. 
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds.  This action is
also considered to be user activity.

Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
 2014-10-31 18:45:11 -07:00
Craig Mautner
585b0c3dc1 am 6a80527f: am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '6a80527f617e603b3c4931ce88c7804d570de501':
  Add enter-animation-done callback for system windows
 2014-10-31 00:37:01 +00:00
Craig Mautner
6a80527f61 am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
  Add enter-animation-done callback for system windows
 2014-10-31 00:29:52 +00:00
Deepanshu Gupta
38d1fdede3 am 9f4979bf: am c2a72054: am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '9f4979bf1159e156a8bc0936474f3378a274d96e':
  Add missing delegate for AnimatorInflater.
 2014-10-31 00:00:21 +00:00
Deepanshu Gupta
719b92f3c7 am a9f20a25: am 2df4ea46: am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit 'a9f20a25d2bd417a13c9ab56476c9b52cf1463b2':
  Skip loading animations.
 2014-10-31 00:00:03 +00:00
Deepanshu Gupta
7d86136592 am b9bbcccb: am f82046b2: am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit 'b9bbcccb5aaae55bcb0a7e14982fb06ae21f5d0c':
  Fix multiple styles case in resource resolution.
 2014-10-30 23:59:59 +00:00
Deepanshu Gupta
95052e3bb0 am 73b1b5a6: am c5afeb2c: am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit '73b1b5a69f8987228f7b84b236c15148560982b8':
  Use right theme for drawable inflation.
 2014-10-30 23:59:54 +00:00
Deepanshu Gupta
9f4979bf11 am c2a72054: am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit 'c2a72054b158b318fdef54989e39e9220023d4a8':
  Add missing delegate for AnimatorInflater.
 2014-10-30 23:43:26 +00:00
Deepanshu Gupta
a9f20a25d2 am 2df4ea46: am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit '2df4ea4601075b3b0ef3e87d67f7107cbaeb5de2':
  Skip loading animations.
 2014-10-30 23:43:05 +00:00
Deepanshu Gupta
b9bbcccb5a am f82046b2: am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit 'f82046b23367e844b43318d9cb73200750a042a5':
  Fix multiple styles case in resource resolution.
 2014-10-30 23:42:59 +00:00
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