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

7587 Commits

Author SHA1 Message Date
Chet Haase
a9265c1083 am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit '913c023387c319f6c7b1e4878a4d0d07f8624f78':
  Add exclude() methods to Transition
 2013-09-12 11:11:07 -07:00
Chet Haase
913c023387 am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit 'c0f652093ec9dffad23477402ab1cc0a5e415931':
  Add exclude() methods to Transition
 2013-09-12 11:09:26 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Daniel Sandler
c77a18beca am 22dbb77b: am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit '22dbb77b194536191770a64b4fd7d8df7feb9167':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:41:54 -07:00
Daniel Sandler
22dbb77b19 am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit 'f3da15bde723e6f27ae6b64e8f0765e98b02e45d':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:38:37 -07:00
Daniel Sandler
f3da15bde7 Merge "Remove spurious density-specific default wallpaper." into klp-dev 2013-09-12 17:35:53 +00:00
Daniel Sandler
0594b192cd Remove spurious density-specific default wallpaper. 
Bug: 10671611
Change-Id: I719bfb09cfd1cbc56f577cdcbf0a9945739355e2
 2013-09-12 01:18:55 -04:00
Baligh Uddin
1d6c7990ba Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:24 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
Selim Gurun
dde1f8b01b am 1e763fd2: am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '1e763fd280b3dc555e6a0a3a6458fbdb9a43e096':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:08:56 -07:00
Selim Gurun
1e763fd280 am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit 'e4fdc84794923f9408fc400ed9177178329a08cd':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:05:59 -07:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e Revert "Add permissions for the InCallUI Split." 
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.

Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
 2013-09-12 00:57:34 +00:00
Eric Laurent
835b5f344b am e33b79ef: am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit 'e33b79ef373fd3db9de035b5ecf2137a0684a441':
  Add HOTWORD as an AudioSource
 2013-09-11 17:25:05 -07:00
Amith Yamasani
05a1278ea4 am 2861921c: am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit '2861921c2433867679bd7bd1bb674239eb0afa50':
  Change selection highlight for intent disambig dialog
 2013-09-11 17:24:39 -07:00
Adam Powell
a395e70109 am 18149fcf: am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '18149fcf86eee3335b28b2c2373b585c4e18745a':
  Action bar refactoring and transitions
 2013-09-11 17:23:37 -07:00
Santos Cordon
e7f6bfbc51 am 07d545e0: am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '07d545e08d615865860a0f73b7eabfd149754893':
  Add permissions for the InCallUI Split.
 2013-09-11 17:23:04 -07:00
Alexander Ray
4c980cc6ae am b0049151: am 7563d423: Merge "Add consumer IR framework" into klp-dev 
* commit 'b0049151f7c1f2ffa7481ac7c6f6baf7a548c5e8':
  Add consumer IR framework
 2013-09-11 17:23:01 -07:00
Sandeep Siddhartha
6f64688bc8 am 6c5e9fb4: am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit '6c5e9fb4c4215f76a8a1fd8d72eee1154deb1039':
  Remove HotwordRecognition APIs
 2013-09-11 17:22:55 -07:00
Eric Laurent
e33b79ef37 am 95a18139: Merge "Add HOTWORD as an AudioSource" into klp-dev 
* commit '95a181397dad3113b96e3cc7392a5b0f5d742f39':
  Add HOTWORD as an AudioSource
 2013-09-11 17:17:50 -07:00
Eric Laurent
95a181397d Merge "Add HOTWORD as an AudioSource" into klp-dev 2013-09-12 00:15:31 +00:00
Amith Yamasani
2861921c24 am bdd06c0a: Merge "Change selection highlight for intent disambig dialog" into klp-dev 
* commit 'bdd06c0a13a7d4c55d6b250ebbe8eeb9d1288b7c':
  Change selection highlight for intent disambig dialog
 2013-09-11 16:58:43 -07:00
Amith Yamasani
bdd06c0a13 Merge "Change selection highlight for intent disambig dialog" into klp-dev 2013-09-11 23:56:44 +00:00
Chet Haase
ff58f92a0a Add exclude() methods to Transition 
It would be useful for a transition to declare not just which
targets it wants to be run on, but also which targets it wants
to avoid. For example, you may not want to animate the items of
a ListView, or some other specific target in the view hierarchy.

This change adds various exclude*() methods which make it
possible to alter a transition to automatically ignore specific
views, ids, or classes in the hierarchy.

Issue #10692794 Transitions: Need API for excluding targets

Change-Id: If38025cdbee537a545e5a4268cbbd763af4622c5
 2013-09-11 13:53:43 -07:00
Adam Powell
18149fcf86 am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '6847447da0b3e2e30e88838ec85244d1a0ee8927':
  Action bar refactoring and transitions
 2013-09-11 13:42:28 -07:00
Adam Powell
6847447da0 Merge "Action bar refactoring and transitions" into klp-dev 2013-09-11 20:38:41 +00:00
Amith Yamasani
ab7cbcef49 Change selection highlight for intent disambig dialog 
Use standard selection/activation highlights

Bug: 10529505
Change-Id: I81bc0a1a799f93dd6595d38c1a42d6d316e0d61a
 2013-09-11 13:06:23 -07:00
Santos Cordon
07d545e08d am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'e0b7e4cf455b21316661b158edee12ac5467995c':
  Add permissions for the InCallUI Split.
 2013-09-11 12:10:13 -07:00
Alexander Ray
b0049151f7 am 7563d423: Merge "Add consumer IR framework" into klp-dev 
* commit '7563d42331ed7df7f026c8921ae990ce2fca9efd':
  Add consumer IR framework
 2013-09-11 12:10:06 -07:00
Santos Cordon
e0b7e4cf45 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-11 19:08:34 +00:00
Sandeep Siddhartha
6c5e9fb4c4 am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit 'f702286c94f0df9fc147135c19f12ef34e8594c9':
  Remove HotwordRecognition APIs
 2013-09-11 12:06:29 -07:00
Alexander Ray
7563d42331 Merge "Add consumer IR framework" into klp-dev 2013-09-11 19:05:38 +00:00
Sandeep Siddhartha
f702286c94 Merge "Remove HotwordRecognition APIs" into klp-dev 2013-09-11 19:01:51 +00:00
Baligh Uddin
7dac9d13b8 Import translations. DO NOT MERGE 
Change-Id: Ida1a70718ad0bc4216a7089385f2a62fe0111544
Auto-generated-cl: translation import
 2013-09-11 11:03:11 -07:00
Sandeep Siddhartha
65a6ba3478 Remove HotwordRecognition APIs 
- and its usage from Keyguard

Bug: 10708010
Change-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c
 2013-09-11 11:01:13 -07:00
Baligh Uddin
7f5ebcd4f9 Import translations. DO NOT MERGE 
Change-Id: Ib84e443010cb0673afbce92137370d11b393c17c
Auto-generated-cl: translation import
 2013-09-11 10:28:35 -07:00
Erik Gilling
51e95df8f2 Add consumer IR framework 
Change-Id: I786c00db0cce61ef75e4edc24e90f2cdcba6dbfb
 2013-09-11 09:52:47 -07:00
Adam Skory
a7cda03a47 resolved conflicts for merge of 7d17de35 to master 
Conflicts:
	core/res/res/values/public.xml

Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
 2013-09-11 16:16:19 +01:00
Adam Skory
7d17de357a am 86d9c457: Merge "Revert services assist context in KitKat" into klp-dev 
* commit '86d9c457de3285f01552d4046a8a260c7a75147f':
  Revert services assist context in KitKat
 2013-09-11 04:46:13 -07:00
Adam Skory
7140a25f01 Revert services assist context in KitKat 
Reverts extension to assist context API to query
foreground services for assist context data.

Also hides Intent.ACTION_VOICE_ASSIST because
nobody's actually using it yet.

Bug: 10461702
Change-Id: Idf6836adc659b434e11ebb2b98e8b814c94a7227
 2013-09-11 12:04:58 +01:00
Adam Powell
ad79b90f21 Action bar refactoring and transitions 
* Remove the extra occurrence of the Up caret view and reuse the
  standard home view.

* Use new transition APIs to animate changes in action bar content.

Change-Id: I7af3bb580ef4bff7d8dec9e21649b856fe73c77b
 2013-09-10 18:09:03 -07:00
Eric Laurent
357263da0e Add HOTWORD as an AudioSource 
- This is a low-priority source that can be preempted by others
- This is required for scenarios where someone wants an alway-on
  graceful microphone

Bug: 10640877.

Change-Id: Idb3577541103717cb713a7a93d3762ad2c2f4710
 2013-09-10 18:03:10 -07:00
Alan Viverette
aaca5d888a Add public attr for fragmentBreadCrumbStyle, apply in constructor 
BUG: 10680808
Change-Id: I7c22c1ff0b91892e62ea6bf6a311d33df6f13d78
 2013-09-10 15:04:10 -07:00
Santos Cordon
4f7ffa90d1 Add permissions for the InCallUI Split. 
Change-Id: I7e45aeebbe8873f99fe897272390fb06f1840d2d
 2013-09-10 10:43:05 -07:00
Baligh Uddin
3780d54e3c Merge "Import translations. DO NOT MERGE" 2013-09-10 04:58:25 +00:00
Baligh Uddin
a244732d93 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-10 04:58:04 +00:00
Jeff Sharkey
d04e0c0adb am 78bb372f: am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* commit '78bb372fb70b7c383ae4ab158734666de9ce8e95':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-09 21:45:11 -07:00
Jeff Sharkey
78bb372fb7 am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* commit 'af9272349fb9eed1653d5af0768c9517e36070a6':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-09 21:42:50 -07:00
Jeff Sharkey
af9272349f Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* changes:
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-10 04:40:41 +00:00
Jeff Sharkey
b7757a6b32 Rename offer() to add(), remove/hide some APIs. 
Change MatrixCursor offer() to add() based on review feedback.  Remove
some now-unused XML metadata.  Hide document creation, since it's not
supported in initial version.

Bug: 10577809, 10461706, 10678563
Change-Id: I7b3f4c6899c28f633471ef816bee22bf032aa0d2
 2013-09-09 17:55:10 -07:00