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

49033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
d19fbe34e3 am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit 'ca234a0765e3b43ab202f29caceba68b7c5363df':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-01 10:33:46 -07:00
Adam Powell
ca234a0765 am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit '8656ba1298da98dde9ff6517aa06b86317a65bf7':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-01 10:29:58 -07:00
Adam Powell
8656ba1298 Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 2011-06-01 10:27:54 -07:00
Scott Main
1dd5fba949 am 2b876a31: am f5992953: docs: fix typos 
* commit '2b876a31e2a8a424b6e0c51e7a403cf64fe22f0f':
  docs: fix typos
 2011-06-01 09:54:00 -07:00
Scott Main
2b876a31e2 am f5992953: docs: fix typos 
* commit 'f5992953e410a7ce4028e17f50474679b30d2a2a':
  docs: fix typos
 2011-06-01 09:50:21 -07:00
Scott Main
f5992953e4 docs: fix typos 
Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
 2011-06-01 09:46:04 -07:00
Robert Greenwalt
903cd57f67 am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
  Remove redundent getCurrentCdmaDataConnectionState
 2011-06-01 09:12:07 -07:00
Robert Greenwalt
ddae893681 Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 2011-06-01 09:01:22 -07:00
Dianne Hackborn
c691d7f9a3 am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'b8d109318f6fc88d1a59ca0e6e362963cd06960c':
  Forgot this file.
 2011-05-31 18:33:00 -07:00
Dianne Hackborn
b8d109318f am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
  Forgot this file.
 2011-05-31 18:30:01 -07:00
Dianne Hackborn
fd20656067 Merge "Forgot this file." into honeycomb-mr2 2011-05-31 18:28:50 -07:00
Dianne Hackborn
363456c724 Forgot this file. 
Change-Id: I8aa457d8d81d283f8cc36f68eca33fcb3a86ccad
 2011-05-31 18:27:49 -07:00
Dianne Hackborn
7322e557cf am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
 2011-05-31 18:11:29 -07:00
Dianne Hackborn
a4cfcf10cc am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 
* commit '75d6b3c2a24224e41e87685db0d9d0b8abea091d':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
 2011-05-31 18:08:27 -07:00
Dianne Hackborn
75d6b3c2a2 Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 2011-05-31 18:05:26 -07:00
Dianne Hackborn
2f0b17573d Fix issue #4502672: Wrong xml resources used for homescreen widgets. 
There was a race in the system process between applying the initial
configuration and executing code in higher-level system services
like the app widget service that relies on the config.  For some
reason it starting showing up more after my code changes; it should
now be completely fixed.

Also fix the activity starting window to run in compatibility mode
if its application is going to be in compatibility mode.

And some various cleanup and small fixes.

Change-Id: I0566933bf1bbb4259c1d99a60c0a3c19af1542e5
 2011-05-31 18:04:14 -07:00
Adam Powell
f606167c7a Fix bug 4501658 - adjust toast frame padding 
Change-Id: I32fa68e27724ddb20f09a0ac99a497a97c425600
 2011-05-31 17:59:02 -07:00
Joe Malin
409db558b3 am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
* commit 'a3d68aedfbd21c340ff7c76394b8b9dfca67ae13':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
 2011-05-31 16:43:55 -07:00
Joe Malin
a3d68aedfb am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
* commit 'd40a5d5cb754b132d6c10ae78a6214f38ed23f3d':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
 2011-05-31 16:40:59 -07:00
Joe Malin
d40a5d5cb7 Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
Change-Id: I48ddc26d4fc8e2e44627cfb0e98d9f0b596042b6
 2011-05-31 16:36:04 -07:00
Robert Greenwalt
a4e82851e9 Remove redundent getCurrentCdmaDataConnectionState 
replace with existing and generic getCurrentDataConnectionState.
bug:3487138

Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
 2011-05-31 16:25:58 -07:00
Jeff Brown
7e193916c0 am 425f2a6d: am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2 
* commit '425f2a6d71b3af058630367d75b0b924bf1aee49':
  Use ViewConfiguration to seed input system configuration.
 2011-05-31 15:51:21 -07:00
Jeff Brown
f257c4b575 am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 
* commit '1311455f3ee8cbd2b2b83ec2d98e95e1da108743':
  Button state should reflect actual buttons. (DO NOT MERGE)
 2011-05-31 15:50:59 -07:00
Jeff Brown
425f2a6d71 am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2 
* commit 'c272d4279493000928b8b7c6dbcf2d2b7d8d08b2':
  Use ViewConfiguration to seed input system configuration.
 2011-05-31 15:44:04 -07:00
Jeff Brown
1311455f3e am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 
* commit 'd854304c2bcadbda37a7f1b24723dbc0030073ca':
  Button state should reflect actual buttons. (DO NOT MERGE)
 2011-05-31 15:44:01 -07:00
Jeff Brown
c272d42794 Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2 2011-05-31 15:42:18 -07:00
Jeff Brown
d854304c2b Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 2011-05-31 15:42:08 -07:00
Jeff Brown
214eaf4887 Use ViewConfiguration to seed input system configuration. 
Fix bug where the pointer presentation would be updated on
any input reader timeout rather than only when a pointer gesture
is in progress.

Bug: 4124987
Change-Id: Ie9bba4a0b3228d55e45e65fa2ede5cd6ba887a08
 2011-05-31 15:00:59 -07:00
Jeff Brown
4e3f7206eb Button state should reflect actual buttons. (DO NOT MERGE) 
Bug: 4124987
Change-Id: If0585bd1432c8c61ed0c9a6a4f6de4a62e3f6e53
 2011-05-31 15:00:58 -07:00
Amith Yamasani
42f53c7e6c am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 
* commit 'eb01203447afd2606b77739a0bd0b2ea216756e4':
  Use Holo background and proper padding for App Permissions UI.
 2011-05-31 14:06:38 -07:00
Amith Yamasani
eb01203447 am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 
* commit '0119a67e72790fb14b05130e18fa0785b4fa8531':
  Use Holo background and proper padding for App Permissions UI.
 2011-05-31 14:02:11 -07:00
Amith Yamasani
0119a67e72 Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 2011-05-31 13:58:34 -07:00
Amith Yamasani
ff7705e1d3 Use Holo background and proper padding for App Permissions UI. 
Bug: 4515158
Change-Id: I47a8f2fbdc2547dd08e199ccbfa51710048963ae
 2011-05-31 13:03:59 -07:00
Tadashi G. Takaoka
6d1b8995a6 am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE) 
* commit '69a487763812d2c0fb3c9900b12862997bc77f4d':
  Fix input type judgment of WebTextView (DO NOT MERGE)
 2011-05-31 00:23:25 -07:00
Tadashi G. Takaoka
69a4877638 am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE) 
* commit '8ede62745faa02265f927941d1195b6c1bf05ebb':
  Fix input type judgment of WebTextView (DO NOT MERGE)
 2011-05-31 00:18:54 -07:00
Tadashi G. Takaoka
8ede62745f Fix input type judgment of WebTextView (DO NOT MERGE) 
Bug: 4490948
Change-Id: I232b8f1301128f1c77d72d92777a45c63f215a9c
 2011-05-31 11:24:23 +09:00
Conley Owens
1bbcc6953a am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 
* commit '10b364b4bea8537f955bbbb8b9b40061264b29c9':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
 2011-05-29 09:00:21 -07:00
Xavier Ducrohet
59e699f13d am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. 
* commit '228e4716278f450a95be5addacc3c6c940668493':
  Merge 6103e22c from honeycomb-mr1. do not merge.
 2011-05-29 09:00:16 -07:00
Xavier Ducrohet
311f9493df am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. 
* commit 'af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
 2011-05-29 08:59:57 -07:00
Ed Heyl
39ddeae0b6 Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-05-29 08:21:53 -07:00
satok
7e2181c0de am 93b05690: am 5485ff61: Reduce the number of notification icons on narrow screens. 
* commit '93b05690ff006fa3f96ed5e09031e18d529ae794':
  Reduce the number of notification icons on narrow screens.
 2011-05-28 00:06:55 -07:00
satok
93b05690ff am 5485ff61: Reduce the number of notification icons on narrow screens. 
* commit '5485ff6141ccebad2c171a9a51ffdbcb72703bd7':
  Reduce the number of notification icons on narrow screens.
 2011-05-28 00:02:54 -07:00
satok
5485ff6141 Reduce the number of notification icons on narrow screens. 
For devices with minimum width between 600 and 720 dp, show
only 3 icons (and then, only in portrait). All other
configurations will show 5.

Bug: 4501374
Change-Id: I88168560fc2876c26cd3eb57f2db0b0cfe8b4fdd
 2011-05-28 15:58:30 +09:00
Kazuhiro Ondo
a36c8f693d am 57675037: Further fix for SIM detection. 
* commit '57675037aa279e715a966e2888a31c97381a5fe4':
  Further fix for SIM detection.
 2011-05-27 19:32:04 -07:00
Kazuhiro Ondo
57675037aa Further fix for SIM detection. 
Refining SIM ready condition on UICC w/ multiple apps.
Also migration for RIL to use SIM_READY indication in case of UICC
presence instead of current NV_READY message.

Change-Id: I3445a628e2d32a24292e6a69785fe72422481221
 2011-05-27 18:36:05 -07:00
Dianne Hackborn
096762d6ef am 8075fe48: am 78470718: Fix various places that were using the wrong display metrics. 
* commit '8075fe48bf345e4014de9b7bee8def5f4373457c':
  Fix various places that were using the wrong display metrics.
 2011-05-27 17:16:19 -07:00
Dianne Hackborn
8075fe48bf am 78470718: Fix various places that were using the wrong display metrics. 
* commit '784707187d96b731df5256c1c2adb0aaf9037239':
  Fix various places that were using the wrong display metrics.
 2011-05-27 17:12:53 -07:00
Dianne Hackborn
784707187d Fix various places that were using the wrong display metrics. 
Change-Id: I1ac2a0c4a1b7c851dbc99d26f295c7dd49b0bd5c
 2011-05-27 17:09:19 -07:00
Dianne Hackborn
9b94aa18f7 am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps. 
* commit 'e5d377014b04022a04fd0b2b24b343d1e0ec8d2a':
  Fix compat mode bugs when updating apps.
 2011-05-27 17:01:47 -07:00
Dianne Hackborn
e5d377014b am 8ea5e1d7: Fix compat mode bugs when updating apps. 
* commit '8ea5e1d79eb1f05ee7628b0d45ea8fc8eea5330d':
  Fix compat mode bugs when updating apps.
 2011-05-27 16:58:33 -07:00