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

2779 Commits

Author SHA1 Message Date
Deepanshu Gupta
9713d74018 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 
automerge: aa53920

* commit 'aa53920479b7e1916e0d2afbf6846250a2deeabf':
  Remove needlessly thrown IOException.
 2014-11-10 23:54:59 +00:00
Adam Lesinski
4d29c66930 Merge commit 'fa31eb2c' into manualmerge 
Conflicts:
	tools/split-select/RuleGenerator_test.cpp

Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625
 2014-11-10 14:32:11 -08:00
Deepanshu Gupta
a09dda8162 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c 
* commit '0e3925dfb3ea4e9185202dd963f03f5ca1df17d0':
  Remove needlessly thrown IOException.
 2014-11-10 22:05:16 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +00:00
Deepanshu Gupta
0e3925dfb3 Merge "Remove needlessly thrown IOException." into lmp-dev 
automerge: f305d2c

* commit 'f305d2c4a80af9e2011824349adc6f133cd8822c':
  Remove needlessly thrown IOException.
 2014-11-10 20:56:36 +00:00
Adam Lesinski
a674a1ee79 Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev 2014-11-10 19:45:28 +00:00
Adrian Roos
37d7a68de7 Fix inset hinting when adding window 
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.

Also adds hinting for the stable insets.

Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
 2014-11-10 17:46:57 +01:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Adam Lesinski
dcdfe9fef4 split-select: Fix rules generated for anydpi density 
Change-Id: I9de569ca9a76eb22df4d0e178df847ba1c7d0b01
 2014-11-06 14:57:34 -08:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169) 
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
 2014-11-06 14:02:35 -08:00
Deepanshu Gupta
9173c8a2e9 Remove needlessly thrown IOException. 
Change-Id: If34986367554c98f96f6f9a1088f5e25077a1be1
 2014-11-06 11:43:37 -08:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00
Adam Lesinski
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +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
8a5bb15efa Fix automerge issue 
Duplicate method declaration.

Change-Id: I9355bd7c716e668ad7892fd12e93352455d149b5
 2014-11-03 20:35:54 -08: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
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
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
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
de7de47fef Add error checking to aapt for split generation 
Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
 2014-11-03 15:55:44 -08: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
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
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
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