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

90755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
d15321bbf5 Use the same interrupt/resume logic for all functor calls 
bug:7093396

The functor was able to change the renderer's blend mode without it
being restored in process mode. This single path of updating gl caches
reduces likelihood of this occurring in the future.

Change-Id: Ie367532f9c683299f02bc4f635d7cb31f96db39f
 2012-11-28 14:45:04 -08:00
Scott Main
d294d429f9 am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit 'ceafd15df99ed77c9e9ed5e93d2c1f062a095169':
  docs: revisions to gps landing pages
 2012-11-28 13:19:36 -08:00
Dirk Dougherty
a539807a7c am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 
* commit '37f00afa4fe49730a9f7d3220c509247fd12828c':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-28 13:19:30 -08:00
Scott Main
ceafd15df9 am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit '23cc5d99fcb97c5a369b3ddf7f90505f6bb29363':
  docs: revisions to gps landing pages
 2012-11-28 13:17:36 -08:00
Dirk Dougherty
37f00afa4f am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 
* commit 'f4d44618aa43b85c8a2a5bdd95e7454e2736452a':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-28 13:17:28 -08:00
Scott Main
23cc5d99fc Merge "docs: revisions to gps landing pages" into jb-mr1-dev 2012-11-28 13:15:27 -08:00
Dirk Dougherty
f4d44618aa Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 2012-11-28 13:14:36 -08:00
Brian Colonna
ceb87a664f am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit '6f6facc17812fe529f3de0b75de5f9011d73eacc':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-28 12:48:32 -08:00
Brian Colonna
6f6facc178 Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 2012-11-28 12:46:24 -08:00
Zhihai Xu
2c7dac19dd am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit 'e3f7c45241a90d3e4b76d28911831f5dcbaaa038':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-28 12:21:11 -08:00
Zhihai Xu
e3f7c45241 Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 2012-11-28 12:19:42 -08:00
Fabrice Di Meglio
b878ddb56e Fix bug #7621927 Radio button/TextView drawable regression in 4.2 
- as we remove the 9 patch padding trick, we need also to do the correct
positioning of the radio / checkbox / star during draw

Change-Id: I02b67bef9c0f2dc1c0c65361de14ab20ce9b881d
 2012-11-28 11:59:27 -08:00
Adam Powell
b29dc7e37b am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 
* commit 'f3a39f2df40503e8e3a91937f9f5f33b43528274':
  Remove overzealous mutate() sanity check in LayerDrawable
 2012-11-28 11:29:51 -08:00
Adam Powell
f3a39f2df4 Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 2012-11-28 11:27:21 -08:00
Zhihai Xu
a643347568 am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit '5c0f3e5075c8ac8b22bbaeb32bddfada9657577a':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:26:08 -08:00
Scott Main
b0d2673184 docs: revisions to gps landing pages 
Change-Id: Ie9f2cf526a3ea328ce22dfb208e7eb95add56d0b
 2012-11-28 11:23:35 -08:00
Zhihai Xu
5c0f3e5075 Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 2012-11-28 11:22:21 -08:00
Adam Powell
1cf2ca8358 Clean up behavior of type arguments for MediaRouter#getSelectedRoute 
MediaRouter's policy so far has been around a single selected route,
but when route types are entirely orthogonal this should not be the
case. However we still don't want to get into a situation where we
have multiple, very different routes selected for different types at
the same time, we still want to have more of an element of
predictability.

Behavior of getSelectedRoute is now:

* If the selected route matches at least one type with the requested
  type flags, it is still considered selected for that request.

* If the caller specifically requested the selected user route and the
  currently selected route is not a user route, return null.

* If the requested type flags do not match any types with the selected
  route, return the default system route.

Note that this is "any" behavior instead of "all" - this matches
existing usage of the method. We may consider adding an "all" variant
later on.

Bug 7588042

Change-Id: I3a79d8153ca6b882fd3ef6b9b1de8f538873dec2
 2012-11-28 11:22:01 -08:00
Scott Main
1cc041f7d7 am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '7538ff0920a8cbdfe68885221d1275633eafc613':
  docs: update dreamservice description
 2012-11-28 10:43:22 -08:00
Scott Main
7538ff0920 am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663':
  docs: update dreamservice description
 2012-11-28 10:40:18 -08:00
Robert Ly
076a6021d3 docs: fix bug 7628699 
Change-Id: I7e8ca29910345559993cf415c2a89a21f50e4e17
 2012-11-28 10:11:22 -08:00
Scott Main
35473e6e6d Merge "docs: update dreamservice description" into jb-mr1-dev 2012-11-28 10:05:54 -08:00
Andreas Huber
8be8ee4c4a am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit 'f0afad008bf78576ff364bcd8bc93b7aa8090b34':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:43:29 -08:00
Andreas Huber
f0afad008b Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 2012-11-28 09:39:27 -08:00
Daniel Sandler
78d2febf1f am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit 'c7f55f5595fb6ffdec7796e801545156aefd3655':
  New timings for default & fallback notification vibration.
 2012-11-28 06:28:13 -08:00
Daniel Sandler
c7f55f5595 Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 2012-11-28 06:22:53 -08:00
Dianne Hackborn
40e9f2922c Quiet down a lot of logging. 
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).

Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
 2012-11-27 19:12:23 -08:00
Daniel Sandler
6684a2ce1a am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev 
* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
  Cleanups in Notification.java.
 2012-11-27 18:41:01 -08:00
Daniel Sandler
bf0e106a7d Merge "Cleanups in Notification.java." into jb-mr1.1-dev 2012-11-27 18:38:33 -08:00
Daniel Sandler
70f1782298 am 54525d8e: Merge "Clean up the Builder test." into jb-mr1.1-dev 
* commit '54525d8e4b2bcffcf33b5df8292e9ec45b9aaa3d':
  Clean up the Builder test.
 2012-11-27 18:17:45 -08:00
Daniel Sandler
7908581bc0 am 5bff5517: Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev 
* commit '5bff551710d2f2b9d7c6ea814b18b042ee0fe663':
  Refresh the status bar clock format on user switch.
 2012-11-27 18:16:10 -08:00
Daniel Sandler
54525d8e4b Merge "Clean up the Builder test." into jb-mr1.1-dev 2012-11-27 18:13:29 -08:00
Daniel Sandler
5bff551710 Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev 2012-11-27 18:12:47 -08:00
kmccormick@google.com
b217b825a0 am 1f301634: am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit '1f301634d3a9765decad91327d732064f11aae77':
  Doc update: new Notify User AU class
 2012-11-27 17:00:27 -08:00
kmccormick@google.com
1f301634d3 am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit '58d55b0456a72daaf31c4e02227e82a8707ecf73':
  Doc update: new Notify User AU class
 2012-11-27 16:57:51 -08:00
kmccormick@google.com
58d55b0456 am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit 'd60ea46fe7a9856ca592ff7dea79aa8ce80f5e66':
  Doc update: new Notify User AU class
 2012-11-27 16:56:03 -08:00
kmccormick@google.com
d60ea46fe7 am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit 'a880436f4416168d256822a23bd23f936136706d':
  Doc update: new Notify User AU class
 2012-11-27 16:54:01 -08:00
kmccormick@google.com
a880436f44 am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit 'b7863a3ce4db964322783ff7e84acc5713e04d1d':
  Doc update: new Notify User AU class
 2012-11-27 16:52:00 -08:00
&& repo sync -j8
b7863a3ce4 Merge "Doc update: new Notify User AU class" into jb-dev-docs 2012-11-27 16:49:37 -08:00
&& repo sync -j8
0aae00051c Doc update: new Notify User AU class 
Change-Id: Idcda9535c5aa2602cf4f0aecb3ab4b1518ab966b
 2012-11-27 16:37:36 -08:00
Robert Ly
e03a213e12 am e3a94e9d: am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev 
* commit 'e3a94e9dd21c002b003ec1a946e2ec6df25c9e0d':
  docs: add new GMS landing and reference
 2012-11-27 16:36:35 -08:00
Robert Ly
e3a94e9dd2 am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev 
* commit 'd29457e40379d6df0cbf8bbbe5945f0827a0d19c':
  docs: add new GMS landing and reference
 2012-11-27 16:35:19 -08:00
Robert Ly
d29457e403 Merge "docs: add new GMS landing and reference" into jb-mr1-dev 2012-11-27 16:32:05 -08:00
Dirk Dougherty
cf62cbca10 Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc. 
Change-Id: I45de360c45426ab6d2e04ef6a9e5fa920ff63c57
 2012-11-27 16:29:40 -08:00
Daniel Sandler
bdc9c83ba5 New timings for default & fallback notification vibration. 
Bug: 7599791
Change-Id: Ieae1cba864537b192be013e4f00131bcc59c6369
 2012-11-27 19:22:22 -05:00
Craig Mautner
067a7ac494 am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 
* commit '9e98927e2dd3e9498753e6878709b2625e96feea':
  Retain configuration change info and sync access.
 2012-11-27 16:20:34 -08:00
Craig Mautner
9e98927e2d Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 2012-11-27 16:17:45 -08:00
Dirk Dougherty
3cc883459a am b544af37: am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev 
* commit 'b544af3796b43afa9ae6f2196df569de175e0d24':
  Doc change: fix typo in jb docs.
 2012-11-27 16:10:07 -08:00
Robert Ly
6519ca0c5f docs: add new GMS landing and reference 
Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba
 2012-11-27 16:09:58 -08:00
Dirk Dougherty
b544af3796 am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev 
* commit '5f8c2dfebe23d4a0a212138b2243059c24940d21':
  Doc change: fix typo in jb docs.
 2012-11-27 16:08:00 -08:00