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

95938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed Heyl
4f017e757b Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 2012-11-09 22:49:35 -08:00
Baligh Uddin
bf58331a68 am 8baf63d5: (-s ours) am eba39ec1: am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit '8baf63d5bae9a96d34b29f3c75d51bf079642352':
  Import translations. DO NOT MERGE
 2012-11-09 22:49:34 -08:00
Andy McFadden
b842467027 am 9d42794d: am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit '9d42794dde0dc6f83b6cf29ba66c3cf535ec9ae3':
  Reduce emulator logspam
 2012-11-09 22:49:30 -08:00
Scott Main
88b0d1e368 am 78f7e807: am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '78f7e807dfec36fe695f7b2d7241c1a188893d20':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:45:37 -08:00
Jeff Sharkey
1aa4f6fe7e am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit '5691474c9cbaeb37eeb659a3adbc05d31d668611':
  Emit event log message when switching users.
 2012-11-09 22:45:33 -08:00
Baligh Uddin
8baf63d5ba am eba39ec1: am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit 'eba39ec15c1d07f5fe0c48d7d1176cc0b388d9d0':
  Import translations. DO NOT MERGE
 2012-11-09 22:45:30 -08:00
Andy McFadden
9d42794dde am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit 'a7113f70c55517b5dbf3c54827c4559304faff4f':
  Reduce emulator logspam
 2012-11-09 22:45:26 -08:00
Baligh Uddin
d05c9763bc am aa29e48b: (-s ours) am ff87960b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'aa29e48b2b711a2bf39666c8ecf108fc9c54de05':
  Import translations. DO NOT MERGE
 2012-11-09 22:44:28 -08:00
Scott Main
78f7e807df am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit 'e72e2b74bf5ae66524fc5d1872ba759b85728c65':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:42:13 -08:00
Jeff Sharkey
5691474c9c am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit 'ad08e6dcfc54556759a876106419b4169e9caffe':
  Emit event log message when switching users.
 2012-11-09 22:42:06 -08:00
Baligh Uddin
eba39ec15c am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit 'df2670f162dc7756899f4036750ba6866f5326c6':
  Import translations. DO NOT MERGE
 2012-11-09 22:41:59 -08:00
Andy McFadden
a7113f70c5 am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
  Reduce emulator logspam
 2012-11-09 22:41:51 -08:00
Scott Main
e72e2b74bf am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '85abb087b9ffd05ff8ecc25575018f4a3fcb966d':
  docs: update Tools landing page with info for developer options
 2012-11-09 21:01:49 -08:00
David Agnew
71789e11cc When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 00:01:04 -05:00
Scott Main
85abb087b9 Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 2012-11-09 20:59:18 -08:00
Scott Main
002618b2e9 docs: update Tools landing page with info for developer options 
Change-Id: I1b2ce4e6a27b365a7ec8823fce56c613b1651b1d
 2012-11-09 20:50:52 -08:00
Jason Sams
4bbbfecffa Merge "Update ImageProcessing test." 2012-11-09 18:51:17 -08:00
Jason Sams
83e185c295 Update ImageProcessing test. 
Add async filtering.

Change-Id: I4e32a9b1fe9221b09a7d1433b3da11a5e422d911
 2012-11-09 17:34:14 -08:00
Jason Sams
7ac87f8f45 Merge "JB image processing." 2012-11-09 17:31:18 -08:00
Jeff Sharkey
ad08e6dcfc Merge "Emit event log message when switching users." into jb-mr1.1-dev 2012-11-09 17:23:21 -08:00
The Android Automerger
5624af28af merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-09 16:25:31 -08:00
Jeff Sharkey
2528b50b91 Increase readability of connectivity event log. 
Bug: 6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
 2012-11-09 15:57:02 -08:00
Baligh Uddin
dc978909dc Merge "Import translations. DO NOT MERGE" 2012-11-09 15:51:17 -08:00
Baligh Uddin
df2670f162 am ba52aff4: Import translations. DO NOT MERGE 
* commit 'ba52aff41b602a68cbe7baed1aeb1adf42f34139':
  Import translations. DO NOT MERGE
 2012-11-09 15:50:41 -08:00
Baligh Uddin
aa29e48b2b am ff87960b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'ff87960b474609115f20cb9c0fa6e4b15eebc5c5':
  Import translations. DO NOT MERGE
 2012-11-09 15:46:27 -08:00
Baligh Uddin
ff87960b47 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-09 15:43:48 -08:00
Andy McFadden
798de53cf4 Merge "Reduce emulator logspam" into jb-mr1.1-dev 2012-11-09 15:38:47 -08:00
Jason Sams
9368f0b1b5 JB image processing. 
Change-Id: I10e1909332e9e67df0b9a6fcbcc105813295a8b1
 2012-11-09 15:18:21 -08:00
Baligh Uddin
9972e72127 Merge "Import translations. DO NOT MERGE" 2012-11-09 15:13:52 -08:00
Jeff Sharkey
86597df79f Emit event log message when switching users. 
Change-Id: I8e521e177b0e17e2ab9e033e0ff8bc421cd5f784
 2012-11-09 15:09:13 -08:00
Tim Murray
f89a5ef9e3 Merge "Convert constant to float instead of double in mandelbrot.rs." 2012-11-09 10:08:23 -08:00
Baligh Uddin
1f4da45254 Import translations. DO NOT MERGE 
Change-Id: I4d80873bb07a148963f6f0bde6f19ef315dba318
Auto-generated-cl: translation import
 2012-11-09 09:59:29 -08:00
Baligh Uddin
ba52aff41b Import translations. DO NOT MERGE 
Change-Id: I293bcd411943a50960328eb2ef836f4b9ba2295e
Auto-generated-cl: translation import
 2012-11-09 09:56:53 -08:00
Baligh Uddin
00eedd3fa5 Import translations. DO NOT MERGE 
Change-Id: I2fe703076ce42275a0f36ba5c1982a76242df6fc
Auto-generated-cl: translation import
 2012-11-09 09:55:52 -08:00
Robert Greenwalt
321020b7e0 Merge "Remove DhcpInfoInternal" 2012-11-09 09:51:21 -08:00
Robert Greenwalt
4717c261b2 Remove DhcpInfoInternal 
First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
 2012-11-09 09:46:32 -08:00
Tim Murray
2bd9144ed3 Convert constant to float instead of double in mandelbrot.rs. 
Change-Id: I05820b5e9b696662bd94dbcd4721298e92f1fc1a
 2012-11-09 09:42:51 -08:00
Baligh Uddin
39b1f03e17 Import translations. DO NOT MERGE 
Change-Id: I2788e772ec12b6a9c66cb400fbb43d9210030232
Auto-generated-cl: translation import
 2012-11-09 09:42:34 -08:00
Jean-Baptiste Queru
36465c7815 am e499803e: (-s ours) Re-merge translations - do not merge 
* commit 'e499803e82160f9fd8604ef295ed5d82a4db829d':
  Re-merge translations - do not merge
 2012-11-09 07:45:47 -08:00
Jean-Baptiste Queru
e499803e82 Re-merge translations - do not merge 
Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
 2012-11-09 07:32:57 -08:00
The Android Open Source Project
ad96d5ced8 am 60acb590: (-s ours) am 7a396c39: am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '60acb59089c1e73f74da900d98dc48924a2fabc4':
 2012-11-09 07:28:00 -08:00
John Spurlock
43d84518f2 Disable navbar searchlight if search assist not available. 
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
 2012-11-09 10:27:33 -05:00
The Android Open Source Project
60acb59089 am 7a396c39: am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '7a396c3972de860a4a5874cd3ff1b6b88a610cc2':
 2012-11-09 07:24:10 -08:00
The Android Open Source Project
7a396c3972 am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '18f95189727de29246b663ad4557075678217555':
 2012-11-09 07:22:10 -08:00
The Android Open Source Project
18f9518972 Reconcile with jb-mr1-release - do not merge 
Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef
 2012-11-09 07:19:27 -08:00
Adam Cohen
c9b55965d5 am 483041c9: am ecba011f: am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit '483041c9c4b2812d67de53e567ce059d5e3417bc':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 18:12:04 -08:00
Adam Cohen
42914af09f am d5759ecf: am a49ab4f8: am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'd5759ecf1f08a31fb9fe7f4ca89f020b7361efb1':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 18:12:00 -08:00
Adam Cohen
483041c9c4 am ecba011f: am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'ecba011fd81386895fda02a7d132eadf5c710ae0':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 18:08:57 -08:00
Adam Cohen
d5759ecf1f am a49ab4f8: am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'a49ab4f8f17d9c222275c6196220838528629c66':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 18:08:53 -08:00
The Android Automerger
913f13ef69 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 17:53:27 -08:00