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

92929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Agnew
4c0fc03b5e When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Bug: 7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 14:35:02 -05:00
Ed Heyl
ffea917025 am 5ec97f4e: am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '5ec97f4e82e1adc3bffb9c998b302464517e1f04':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 23:54:08 -08:00
Ed Heyl
5ec97f4e82 am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '4f017e757bdc87d603d135386c888118fc2653ba':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 22:53:24 -08:00
David Agnew
9a7debe585 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-09 22:51:37 -08:00
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
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
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
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
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
Jeff Sharkey
86597df79f Emit event log message when switching users. 
Change-Id: I8e521e177b0e17e2ab9e033e0ff8bc421cd5f784
 2012-11-09 15:09:13 -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
Jean-Baptiste Queru
e499803e82 Re-merge translations - do not merge 
Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
 2012-11-09 07:32:57 -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
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
Adam Cohen
ecba011fd8 am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 16:41:31 -08:00
Adam Cohen
a49ab4f8f1 am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'b82b3b5754305c36cfeb7c87816110da3c7b2ff4':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 16:41:27 -08:00
Andy McFadden
325be8a1ea Reduce emulator logspam 
The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
 2012-11-08 16:40:21 -08:00
Adam Cohen
c1ae43ade0 am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'f69320a1f02de3106a26a3911c25be63fcfaf738':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 16:39:16 -08:00
Adam Cohen
b82b3b5754 am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit '3e9cba4f9db96e3b5ba2ab2f9ad7a7ac2549582d':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 16:39:13 -08:00
Adam Cohen
f69320a1f0 Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 2012-11-08 16:36:56 -08:00
Adam Cohen
3e9cba4f9d Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 2012-11-08 16:35:42 -08:00
The Android Open Source Project
167296d70a am 5c0da20c: am 71a408b9: Reconcile with jb-mr1-release - do not merge 
* commit '5c0da20cbe442794d68106c3c5ee8cd88fee9291':
 2012-11-08 15:47:58 -08:00
Dianne Hackborn
e0d454d2e8 am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
  Remove extraneous logs.
 2012-11-08 15:47:46 -08:00
Daniel Sandler
77f2e27e68 am 9b15f2e5: am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev 
* commit '9b15f2e57520d89fdd350a23ca97db36c3e5b7ca':
  Don't crash if no ECA.
 2012-11-08 15:47:40 -08:00
Chris Wren
b3e8071d81 am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 
* commit 'b1d094ba104f804d152b83517bb7500304f6bae8':
  allow pattern linear layout to manage message_area.
 2012-11-08 15:47:36 -08:00
Daniel Sandler
8d62faea22 am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev 
* commit 'c4639949d20077a58f92e675b16d45dabf964b0c':
  Only show the bouncer for the assistant if secure.
 2012-11-08 15:47:33 -08:00
John Spurlock
2a1e6a69a7 am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..." 
* commit '180484115fcf061d6fbb5637d614d7c88d5d8053':
  Address comments from merged "Fix remaining jank in sec..."
 2012-11-08 15:47:29 -08:00
John Spurlock
b99a6b336d am cc60b7dc: am baee9ed5: am 7a73344b: Minimal fix for stuck google now. 
* commit 'cc60b7dc3c2f1cbb8dc9917ec368e8d89cb050e7':
  Minimal fix for stuck google now.
 2012-11-08 15:47:25 -08:00
Jim Miller
fe3d459d9c am bfd17051: am 271add4e: am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev 
* commit 'bfd17051bc9edee6388125efbac2d50b90eab046':
  Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
 2012-11-08 15:47:21 -08:00
Michael Jurka
9d31d103b3 am 1470297c: am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets 
* commit '1470297c4d0db5d90785b88c8ddf79119720bd42':
  Enforce max number of 5 lockscreen widgets
 2012-11-08 15:47:17 -08:00