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

8732 Commits

Author SHA1 Message Date
Mindy Pereira
8fa648596b am cf0244ce: am 006c2110: am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev 
* commit 'cf0244ce9912ca1b77e26018e978d562b550f286':
  Make touch slop region smaller for watch
 2014-04-30 23:40:42 +00:00
Mindy Pereira
99c4f0713e am 006c2110: am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev 
* commit '006c211056d3a7561d2d97abae369603cc48e63a':
  Make touch slop region smaller for watch
 2014-04-30 23:34:56 +00:00
Mindy Pereira
006c211056 am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev 
* commit '11b715da9be818eb4a1c7a3d77b5d0c4ff03e5a2':
  Make touch slop region smaller for watch
 2014-04-30 19:46:07 +00:00
Mindy Pereira
2920646cbe Make touch slop region smaller for watch 
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
 2014-04-30 11:36:59 -07:00
George Mount
3ee5f40da2 am 8721a548: Merge "Add mechanism for Transitions to target a class." 
* commit '8721a548c13281b4e603db88791d90141acac65c':
  Add mechanism for Transitions to target a class.
 2014-04-29 21:33:28 +00:00
George Mount
97ff65442a am f1526de2: Merge "Transfer image of shared element to launched Activity." 
* commit 'f1526de298e4bfbf1378ba70e04f88286b2f5594':
  Transfer image of shared element to launched Activity.
 2014-04-29 21:33:25 +00:00
George Mount
989a4e9b13 Merge "Add mechanism for Transitions to target a class." 2014-04-29 21:30:37 +00:00
George Mount
f31d367a5c Merge "Transfer image of shared element to launched Activity." 2014-04-29 21:30:27 +00:00
Baligh Uddin
5f08b3ec9c Merge "Import translations. DO NOT MERGE" 2014-04-29 21:02:59 +00:00
George Mount
430f910f37 am cb9f337a: Merge "Add ability to exclude Views in transition XML." 
* commit 'cb9f337af3994a4424ca305258bcde8518b9cb40':
  Add ability to exclude Views in transition XML.
 2014-04-29 20:54:42 +00:00
George Mount
a98fb7ab6a Add mechanism for Transitions to target a class. 
Bug 14289299

Added ability to target a specific class similarly to the
mechanism for excluding a specific class in Transitions.
Also changed XML tag from excludeTargetId to excludeId to
make it symmetric with excludeClass.

Change-Id: Ib371820ec75761243e75b659565b905b1b19c9a2
 2014-04-29 13:08:39 -07:00
George Mount
caa03107d4 Transfer image of shared element to launched Activity. 
First pass of the API will use a Bitmap. Future versions will use
more efficient mechanisms.

Change-Id: I111474dd031fef0b86de871017c85dc679166acf
 2014-04-29 13:08:37 -07:00
George Mount
f976c3d42b Add ability to exclude Views in transition XML. 
Bug 14259955

Change-Id: I47bb10c530c9fec8910ddd96156fc38d6027e1f6
 2014-04-29 13:08:33 -07:00
Dianne Hackborn
4bbca4882f am febeb528: Merge "Implement better computing of battery drain time, actual charge time." 
* commit 'febeb528ba08fcc64b23e762f4001194ff44c31e':
  Implement better computing of battery drain time, actual charge time.
 2014-04-29 18:32:59 +00:00
Dianne Hackborn
1de6b101e5 Merge "Implement better computing of battery drain time, actual charge time." 2014-04-29 18:30:08 +00:00
Dianne Hackborn
260c5020ae Implement better computing of battery drain time, actual charge time. 
Also move time formatter in to framework for use elsewhere.

Change-Id: I42b6a44414b68754af65c522bef5591da5643909
 2014-04-29 11:23:16 -07:00
Chris Craik
ceeccd434c am 40310481: Merge "Add elevation, Z properties to View" 
* commit '403104813cb424ae28df6b4245bafaab21969917':
  Add elevation, Z properties to View
 2014-04-28 23:07:59 +00:00
Chris Craik
cc39e16cb9 Add elevation, Z properties to View 
Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
 2014-04-28 14:33:33 -07:00
Alan Viverette
5f1e58eafa am 5cabee8e: Make switchStyle public 
* commit '5cabee8e3f636e471fc02d49e12d009b7fa20804':
  Make switchStyle public
 2014-04-28 20:38:11 +00:00
Dianne Hackborn
99a58b0e3a am c60f1877: Merge "Rework some of the voice interaction APIs." 
* commit 'c60f1877896e795a6add525ee36770e3aa77dc29':
  Rework some of the voice interaction APIs.
 2014-04-28 20:37:33 +00:00
Alan Viverette
5ec00ab05c Make switchStyle public 
Change-Id: I4960c4ebeb3db09b3d716330b33639c865d37490
 2014-04-28 12:39:15 -07:00
Dianne Hackborn
18f0d357f9 Rework some of the voice interaction APIs. 
On the app side, requests are now composed by subclassing
from various types of Request objects.

On the service side, starting a voice interaction session
involves starting another service that will then manage the
session.  This leads the service design much more to what
we want, where the long-running main service is very tiny
and all the heavy-weight transient session work is elsewhere
in another process.

Change-Id: I46c074c6fe27b6c1cf2583c6d216aed1de2f1143
 2014-04-28 10:54:15 -07:00
Baligh Uddin
cb93b5e26b Import translations. DO NOT MERGE 
Change-Id: I87030c5f80cdb858f13de02988124e22ec6011ea
Auto-generated-cl: translation import
 2014-04-28 10:21:23 -07:00
Baligh Uddin
6f6ba132a7 Import translations. DO NOT MERGE 
Change-Id: I1d6579e5a984f30f7dd19dcb22d134645120ed8f
Auto-generated-cl: translation import
 2014-04-28 09:53:10 -07:00
Alan Viverette
16f4e0b558 am 85ca5eee: Merge "Quantum ripple for ListView selector" 
* commit '85ca5eee32727b6c831302ac684c367483da9e53':
  Quantum ripple for ListView selector
 2014-04-28 01:17:31 +00:00
Alan Viverette
e81af10df2 am 5d15b99d: Merge "Add dialog shadows" 
* commit '5d15b99d7a2b553a10009d3bb333a0d3421340b6':
  Add dialog shadows
 2014-04-28 01:17:28 +00:00
Alan Viverette
2a56ef70cd Merge "Quantum ripple for ListView selector" 2014-04-28 01:14:47 +00:00
Alan Viverette
d1ca75bffe Quantum ripple for ListView selector 
Also fixes row clipping and ripple alpha channel. Only supports showing
ripple on a single list row -- multiple rows for focus traversal and
drag-to-open are coming soon.

BUG: 13212804
BUG: 14257108
Change-Id: Ided15611dc868a513e8d2a994723cdf57b0d206c
 2014-04-27 18:13:34 -07:00
Alan Viverette
6ce9759377 Add dialog shadows 
BUG: 13211941
Change-Id: I4d12a512b91b48dd0b869af5b117142bb363dd27
 2014-04-27 18:10:07 -07:00
John Spurlock
ff1005a6f5 am 7745fb9e: Merge "Introduce condition provider services." 
* commit '7745fb9e95b6938591a46ffcaace8db02c93962f':
  Introduce condition provider services.
 2014-04-25 18:21:40 +00:00
John Spurlock
b22aabbbd2 Merge "Introduce condition provider services." 2014-04-25 18:19:06 +00:00
Dianne Hackborn
1b27c34fb6 am ed407e04: Merge "Initial implementation of new voice interaction API." 
* commit 'ed407e046e63ca1d22a1d9206e2ad558bf821525':
  Initial implementation of new voice interaction API.
 2014-04-25 17:05:58 +00:00
John Spurlock
7340fc8665 Introduce condition provider services. 
Add the condition provider interface, base class, and associated
system metadata.

Pull out common service management code into a reusable helper,
used by notification listeners and condition providers. The
helper, ManagedServices, is now completely self-contained - it
has no dependencies on NoMan or NoMan abstractions.

Bug:13743109
Change-Id: I6856d40f0a2ead78ac9b5707568559a57e7eb009
 2014-04-25 12:35:31 -04:00
Dianne Hackborn
91097de49b Initial implementation of new voice interaction API. 
This gives a basic working implementation of a persist
running service that can start a voice interaction when
it wants, with the target activity(s) able to go through
the protocol to interact with it.  It may even work when
the screen is off by putting the activity manager in the
correct state to act like the screen is on.

Includes a sample app that is a voice interation service
and also has an activity it can launch.

Now that I have this initial implementation, I think I
want to rework some aspects of the API.

Change-Id: I7646d0af8fb4ac768c63a18fe3de43f8091f60e9
 2014-04-24 17:48:58 -07:00
Adam Powell
58f54dc59d am 46ca5060: Merge "Nested scrolling!" 
* commit '46ca506022cb51543dea0489587477f60c570d5f':
  Nested scrolling!
 2014-04-24 18:27:37 +00:00
Adam Powell
46ca506022 Merge "Nested scrolling!" 2014-04-24 18:20:43 +00:00
Adam Powell
10ba27734e Nested scrolling! 
or, "Excuse me, Egon, you said crossing the streams was bad."

Add API for driving a nested scroll from the most deeply nested
applicable scrolling view. The deepest scrolling view dispatches
high-level scrolling events up to cooperative parent views.

Augment ScrollView to support nested scrolling. Next up, more public
framework scrolling views.

Change-Id: I53b5e207fcdece796e08c8592ddb4496b96f600e
 2014-04-24 10:48:52 -07:00
Craig Mautner
6af40da8af am d2cc56eb: resolved conflicts for merge of f8a58208 to master 
* commit 'd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
  Add activity attribute allowEmbedded
 2014-04-24 17:34:10 +00:00
Craig Mautner
d2cc56ebb3 resolved conflicts for merge of f8a58208 to master 
Conflicts:
	core/java/android/content/pm/PackageParser.java
	core/res/res/values/attrs_manifest.xml
	core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
 2014-04-24 10:27:37 -07:00
Craig Mautner
f8a5820817 am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev 
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
  Add activity attribute allowEmbedded
 2014-04-24 16:33:02 +00:00
Craig Mautner
03981a4c2e Merge "Add activity attribute allowEmbedded" into klp-modular-dev 2014-04-24 16:30:14 +00:00
Craig Mautner
ffd14a13ce Add activity attribute allowEmbedded 
Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
 2014-04-24 08:41:29 -07:00
Baligh Uddin
a7e81e4421 Import translations. DO NOT MERGE 
Change-Id: Icd10d420151ef81797ebe9a5d67eabb122e6cb2e
Auto-generated-cl: translation import
 2014-04-23 11:53:59 -07:00
Baligh Uddin
b43b108355 Import translations. DO NOT MERGE 
Change-Id: I99c697cc9974820312756fa89f51e3cf821401e2
Auto-generated-cl: translation import
 2014-04-23 11:27:35 -07:00
Alan Viverette
d8b34e9f3e am 2b38072e: Merge "Add ripple to switches, radio buttons, check boxes, seek bars" 
* commit '2b38072e1fb4f158c8de9d92825f72145c9343bb':
  Add ripple to switches, radio buttons, check boxes, seek bars
 2014-04-23 02:24:37 +00:00
Alan Viverette
6195660681 Add ripple to switches, radio buttons, check boxes, seek bars 
BUG: 14231772
Change-Id: Ie40eac9f68815294460175965a999dd75f4144b5
 2014-04-22 19:07:06 -07:00
Baligh Uddin
9daf4ae467 Import translations. DO NOT MERGE 
Change-Id: I5867f9bda8854f34ee138c135c46219d36e9be49
Auto-generated-cl: translation import
 2014-04-22 17:03:26 -07:00
Justin Koh
a50b9bcc53 am 8effc004: Merge "resolved conflicts for merge of d90712d0 to master" 
* commit '8effc00429d0eece67b65945d41844515a8e3742':
  Update GlobalActions for watches.
 2014-04-22 18:46:40 +00:00
Ji-Hwan Lee
faf894a026 am 87e7ba4f: Merge "Add config resource to add inital mock location providers" 
* commit '87e7ba4f45d633e4ce7ac91539534bb8f6d5247f':
  Add config resource to add inital mock location providers
 2014-04-22 18:46:12 +00:00
Justin Koh
be4c2c2b99 resolved conflicts for merge of d90712d0 to master 
Change-Id: Ia587476c001bce5f0969557b15d366aed6b322b1
 2014-04-22 11:05:15 -07:00