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

1426 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Deepanshu Gupta
7c5020db4f am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit 'd8497e45c72fbb27961d096499984906af19d35f':
  Exclude KXmlParser from LayoutLib.
 2014-10-10 04:26:33 +00:00
Elliott Hughes
b913af5408 Track change to private libcore data structure. 
Bug: 15476051

(cherry picked from commit d47acaeecd991ecd01ecc9a37e60011f545712d7)

Change-Id: Iac79ce3602282a2780dd895995f42ab03f346ad4
 2014-10-09 11:20:56 -07:00
Elliott Hughes
90e01b3b40 am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'b68fe9e5f355a3d13ed74cb89fb3e3818b356cee':
  Track change to private libcore data structure.
 2014-10-09 18:20:23 +00:00
Elliott Hughes
b68fe9e5f3 am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'ae1b6805a2609759186af8d7131c4750e011019a':
  Track change to private libcore data structure.
 2014-10-09 18:13:54 +00:00
Elliott Hughes
d47acaeecd Track change to private libcore data structure. 
Bug: 15476051
Change-Id: I4e28ecfa3a1d03c21f9bbde7f3daf79a79d96fe6
 2014-10-08 16:07:33 -07:00
Deepanshu Gupta
908a4f9a43 am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '4f133894a6e98d8d30557ea42cec92cfb21fa5c9':
  Exclude KXmlParser from LayoutLib.
 2014-10-08 17:34:12 +00:00
Deepanshu Gupta
4f133894a6 Exclude KXmlParser from LayoutLib. 
The class was incorrectly being included in the LayoutLib.

Change-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d
 2014-10-08 10:12:11 -07:00
Deepanshu Gupta
11b14e3996 LayoutLib: Use ICU's line break algo. [DO NOT MERGE] 
Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
(cherry picked from commit 760f6394d0f65fbb5365186e8e068d53c506b653)
 2014-10-08 02:05:05 +00:00
Deepanshu Gupta
fe54f8a496 am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit '09714a76a9463f5e18ea8ac91ba040f6fd2235fd':
  Minor style changes.
 2014-10-03 21:52:46 +00:00
Deepanshu Gupta
3c8140ab4b Minor style changes. 
Addressing code review comments on previous change: 171804201dd

Change-Id: I2c9e0ce35e755c23d8292749828d15a87109d6dc
 2014-10-02 11:45:07 -07:00
Deepanshu Gupta
e4ef95bfe0 am 2e67a882: am 92c40bbd: am 8989290b: am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit '2e67a88214fa93a325a84a4b8e6ae122544c8edb':
  Always resolve enum when resolving resources.
 2014-10-02 13:38:54 +00:00