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

85329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
529c3e2b65 am 9ca26e43: Merge "Don\'t depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 
* commit '9ca26e43652b516f6d38dc92120d802b5e8bfde4':
  Don't depend on LockPatternUtils to get DevicePolicyManager
 2012-09-05 12:51:45 -07:00
Jim Miller
9ca26e4365 Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev 2012-09-05 12:49:31 -07:00
Dmitry Shmidt
22d3d3727b am 096f414d: am 91a65b53: Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev 
* commit '096f414d94faa6b6e8fe0eda75becddfaecf8a32':
  Restore original default Wifi sleep policy (always)
 2012-09-05 12:44:21 -07:00
Daniel Sandler
213a19fb31 am 56f97a9b: am fd5494b8: Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev 
* commit '56f97a9b5933d20ae8c73a3f2671c3a37303c74d':
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.
 2012-09-05 12:44:17 -07:00
Dmitry Shmidt
096f414d94 am 91a65b53: Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev 
* commit '91a65b5339e1e43d56d123003e7112a5223e2f75':
  Restore original default Wifi sleep policy (always)
 2012-09-05 12:41:33 -07:00
Daniel Sandler
56f97a9b59 am fd5494b8: Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev 
* commit 'fd5494b8ef91e8a909622c3bf45dac7537254b41':
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.
 2012-09-05 12:41:30 -07:00
Dmitry Shmidt
91a65b5339 Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev 2012-09-05 12:39:23 -07:00
Jean-Baptiste Queru
80c235a803 am ee2175c7: am ec098efc: am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit 'ee2175c75b18a68325db2b277b7271d4a76e60a9':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:39:04 -07:00
Daniel Sandler
fd5494b8ef Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev 
* changes:
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.
 2012-09-05 12:38:25 -07:00
Jean-Baptiste Queru
ee2175c75b am ec098efc: am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit 'ec098efcb11c4f4a12e7d3e44995536ef1eb7c1b':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:37:18 -07:00
Jean-Baptiste Queru
b2057ad01e am 79a37c45: am f389f282: resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
* commit '79a37c453954f7f04a535ef311bb8bbfc0ee0791':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:36:17 -07:00
Jean-Baptiste Queru
ec098efcb1 am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:36:04 -07:00
Dmitry Shmidt
8de24dca68 Restore original default Wifi sleep policy (always) 
BUG: b/7092819

Change-Id: I6ee6755fd04df2f0169f8602e60542c3591038f3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2012-09-05 12:35:09 -07:00
Jean-Baptiste Queru
79a37c4539 am f389f282: resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
* commit 'f389f2820c731b2b938a7057cde9dc11d87bcbe3':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:34:40 -07:00
Jim Miller
f73fbf79a1 Don't depend on LockPatternUtils to get DevicePolicyManager 
This fixes a crash where LockPatternUtils hasn't been set yet and
keyguard attempts to get the device policy for widgets.

This change breaks the dependency by getting a handle to DPM directly.

Bug:7109723

Change-Id: Iecae91474358821ebd30456648377253864c35cf
 2012-09-05 12:23:06 -07:00
Jean-Baptiste Queru
f389f2820c resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 
Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
 2012-09-05 12:21:50 -07:00
Jean-Baptiste Queru
342c6bc8e5 am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '540995555505486074e9652a9c682bdf6e3056c5':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:12:56 -07:00
Jean-Baptiste Queru
7749a1c5ec am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Fabrice Di Meglio
c0e4a76164 am 86683232: am 5575e97c: Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 
* commit '866832323499e332bcc426b104da9cd842713472':
  Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures
 2012-09-05 12:10:08 -07:00
Scott Main
11763b053b am 08cc303a: am f53c5711: am b693f6a9: am 8f58d381: older not lower 
* commit '08cc303a2cf3175d32af6b1fd3e22e4cd260925c':
  older not lower
 2012-09-05 12:06:39 -07:00
Fabrice Di Meglio
8668323234 am 5575e97c: Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 
* commit '5575e97cea2bbaf0f4f1c3445e28cff2759d4f74':
  Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures
 2012-09-05 12:06:15 -07:00
Scott Main
08cc303a2c am f53c5711: am b693f6a9: am 8f58d381: older not lower 
* commit 'f53c571144f74488a16d57cae260a857c00769b1':
  older not lower
 2012-09-05 12:04:23 -07:00
Fabrice Di Meglio
5575e97cea Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev 2012-09-05 12:03:32 -07:00
Scott Main
a9b07c3e7d am 05cac0b8: am e8c47a88: am 3bcf81df: am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '05cac0b87ececf101d46985ab8e32f6166444f6d':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 12:01:18 -07:00
Scott Main
f53c571144 am b693f6a9: am 8f58d381: older not lower 
* commit 'b693f6a94ca2fa6bd4bba94363112bfd1aeb70ee':
  older not lower
 2012-09-05 12:01:14 -07:00
Scott Main
9b45127a2e am b4d9b7aa: am 3827d432: am 5ba48e12: am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 
* commit 'b4d9b7aa2c1bb77ac62032c3f0469bc754fbb975':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-05 11:59:19 -07:00
Scott Main
b693f6a94c am 8f58d381: older not lower 
* commit '8f58d38103bd3ddc68c2b226e80b9f4c60529dae':
  older not lower
 2012-09-05 11:58:55 -07:00
Scott Main
05cac0b87e am e8c47a88: am 3bcf81df: am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit 'e8c47a88dcaeb78cf5775f889e9dc9a832559ae6':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:58:12 -07:00
Scott Main
b4d9b7aa2c am 3827d432: am 5ba48e12: am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 
* commit '3827d4327e078bed56411b23074bf08e93f67fb3':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-05 11:56:14 -07:00
Scott Main
e8c47a88dc am 3bcf81df: am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '3bcf81dfa44a4a583f5c7345849349974e5e121c':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:55:17 -07:00
Scott Main
8f58d38103 older not lower 
Change-Id: Idd925213af834d138991fc6237cfe0329f73ad67
 2012-09-05 11:54:05 -07:00
Selim Gurun
d773ca8ff2 remove defunct javascript interface 
Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Change-Id: I9441d461caf189467e4ad45de958c13b81f4ff17
 2012-09-05 11:53:44 -07:00
Scott Main
3827d4327e am 5ba48e12: am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 
* commit '5ba48e12d35c103632d435159c04bb377005c300':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-05 11:53:37 -07:00
Scott Main
3bcf81dfa4 am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '253483dd974302f0d286eacf6f0f8a9ac9258f78':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:52:57 -07:00
Scott Main
5ba48e12d3 am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 
* commit 'd4107dca294a2e719b6ba3a268b7147d7cc2922f':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-05 11:51:21 -07:00
Scott Main
253483dd97 Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 2012-09-05 11:50:18 -07:00
Scott Main
d4107dca29 Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 2012-09-05 11:48:56 -07:00
Jean-Baptiste Queru
380a8e3d12 Merge "Am: Clean mLaunchingProviders of all providers started by the client" 2012-09-05 11:40:30 -07:00
Joe Fernandez
ba4cf3c850 docs: Accessibility DevGuide, Jelly Bean edition 
Change-Id: Idafa0d755c0397b539a6de5b10096abc1c06c2c7
 2012-09-05 11:27:48 -07:00
Jean-Baptiste Queru
e5c1a62f0c am 53c76f3a: am 0b5a4a15: am 11626a91: am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '53c76f3a09b41574af802f94c73837ee87ae0230':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:12:23 -07:00
Jean-Baptiste Queru
53c76f3a09 am 0b5a4a15: am 11626a91: am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '0b5a4a15132a9367b6bbff62781e9ad3441b6c1d':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:10:11 -07:00
Jean-Baptiste Queru
0b5a4a1513 am 11626a91: am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '11626a91b6e695e7a8fa9e9a9f1a37df11cfb4e2':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:07:21 -07:00
Jean-Baptiste Queru
11626a91b6 am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '9eb3bd88f14c386c89dd2576c3ca798f2493b0fd':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:04:53 -07:00
Jean-Baptiste Queru
1ca2fee954 Merge "Make default value of auto-sync in SyncStorageEngine configurable" 2012-09-05 11:03:13 -07:00
Jean-Baptiste Queru
9eb3bd88f1 am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:01:25 -07:00
Jean-Baptiste Queru
42a58ecd27 Merge "Revert "Watchdog: Improvement of debuggability"" 2012-09-05 10:55:43 -07:00
Romain Guy
5e9a1efdca am 2f127cdc: am 4a332f5b: Merge "Don\'t invalidate all the glyphs when flushing large textures" into jb-mr1-dev 
* commit '2f127cdc37d1375d02f94208c8840de16ea89ea3':
  Don't invalidate all the glyphs when flushing large textures
 2012-09-05 10:46:13 -07:00
Romain Guy
2f127cdc37 am 4a332f5b: Merge "Don\'t invalidate all the glyphs when flushing large textures" into jb-mr1-dev 
* commit '4a332f5bae18ae613b23b5c643063fb1a23f29c1':
  Don't invalidate all the glyphs when flushing large textures
 2012-09-05 10:44:11 -07:00