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

3241 Commits

Author SHA1 Message Date
Eric Fischer
8447a13f9c Import revised translations. 
Change-Id: I10a93a6f3a274354e88263d86a8855d1e7121f58
 2011-05-26 15:34:01 -07:00
Philip Milne
3f8956d82b Introduction of GridLayout. 
Change-Id: Ia2ec315e7d29dcc5aa13b080fc6ce00708e9c034
 2011-05-26 09:28:26 -07:00
Kristian Monsen
1fae3cf246 Merge "Merge Chromium at 10.0.634.0: Add autofill fax string" 2011-05-25 12:09:46 -07:00
Adam Powell
f8ac6b7394 Action bar tab layout 
Sync with UX on action bar tab layout behavior.

Make action bar tabs behave better with configuration changes.

LinearLayout now supports largest child measurement in unspecified
mode.

Change-Id: Id520641715a61c07e64124a0c5a70912996c98a0
 2011-05-25 11:55:56 -07:00
Kristian Monsen
a014db7f0b Merge Chromium at 10.0.634.0: Add autofill fax string 
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710

Change-Id: I20130029e26f2d9ef6ea4828921b070c887ccb69
 2011-05-25 18:54:31 +01:00
Steve Block
ceb82f71dd Merge "Merge WebKit at r78450: Update useragent string" 2011-05-25 08:15:34 -07:00
Steve Block
ae8eb6beba Merge WebKit at r78450: Update useragent string 
Change-Id: I4d597a8709e9188c083e73a133a12d3121204e6f
 2011-05-25 16:10:29 +01:00
Gilles Debunne
7a4adca1cb Merge "Added a new flag in TextView to disable Suggestions." 2011-05-24 09:25:52 -07:00
John Wang
5ea7a29387 am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE 
* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
  Add UI to handle SIM swap.
 2011-05-23 20:48:57 -07:00
Jim Miller
a0bb3acba1 am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '59a3319ffce100d671145b5bfee7450038b250bf':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-23 20:48:36 -07:00
Tadashi G. Takaoka
23186b88bd Merge "Add new imeFullscreenBackground for Theme.InputMethod.Holo" 2011-05-23 19:00:01 -07:00
Tadashi G. Takaoka
75d27bc52e Add new imeFullscreenBackground for Theme.InputMethod.Holo 
This change also removes unnecessary background from ExtractEditText

Bug: 4431328
Change-Id: I1b35ddd388fe11cac9b7f9dd3f990b6c4d889185
 2011-05-24 10:27:43 +09:00
Adam Powell
7d372b49e2 am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-23 17:18:54 -07:00
Gilles Debunne
f3a135bfba Added a new flag in TextView to disable Suggestions. 
This is needed for specific TextEdit (such as AutoCompleteTextField)
which do not want to display the "No suggestions available" message.

Bug 4443830

Change-Id: Ic228b56bacfdf2765e70eb24952ab087556c1f93
 2011-05-23 17:15:20 -07:00
Jim Miller
4cded6e5ea am 940138de: am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '940138de9eae9be9ef60307af9e5f7a1168af533':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-21 21:35:13 -07:00
John Wang
b7a13791a1 am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE 
* commit '393eb0d06b4536591584a8d4c5fb03c2962835a9':
  Add UI to handle SIM swap.
 2011-05-20 17:22:50 -07:00
John Wang
393eb0d06b Merge "Add UI to handle SIM swap." into honeycomb-LTE 2011-05-20 17:18:56 -07:00
Jim Miller
59a3319ffc am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '67cd389d4b9b6fd3ea0df8af57f58816d8005a4b':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-20 16:56:51 -07:00
John Wang
10e9f668ee Add UI to handle SIM swap. 
bug:4364964

Change-Id: Iadf466401a24dfbd638353d689e6ae89506afc97
 2011-05-20 16:52:51 -07:00
Jim Miller
67cd389d4b am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '2c7906eb392c6349e6f75fd2681310b934d6e262':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-20 16:51:49 -07:00
Jim Miller
2c7906eb39 Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 2011-05-20 16:49:08 -07:00
Adam Powell
7dfdb91420 am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit 'f483ed90401d63b7317f823fcac10315146d3072':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-20 16:14:42 -07:00
Jim Miller
024e429b49 Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI 
Change-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc
 2011-05-20 16:14:15 -07:00
Adam Powell
f483ed9040 am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit 'bdc26dc34a5d848883d5acdee62f5b4403e8fe04':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-20 16:02:21 -07:00
Adam Powell
bdc26dc34a Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 2011-05-20 15:59:19 -07:00
Adam Powell
3f4a764cf4 Change measurement of effective screen height for PopupWindow now that 
DisplayMetrics reports it without system decorations.

Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
 2011-05-20 15:56:25 -07:00
Jim Miller
940138de9e am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '0a734b1894511e833936362820c9e8fec3ca7df3':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-20 13:27:25 -07:00
Jim Miller
0a734b1894 am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '14e45f9b19a846af074d73b3792e35de0448ac21':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-20 13:16:47 -07:00
Adam Powell
d0693bb603 am f2004180: am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit 'f2004180f828584fa8525081a248e8c0f2055327':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:13:28 -07:00
Jim Miller
14e45f9b19 Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 2011-05-20 13:13:19 -07:00
Adam Powell
f2004180f8 am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit 'f5abccefb10e8a31363c98d6a8491cb8168b7174':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:09:13 -07:00
Adam Powell
f5abccefb1 am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:04:11 -07:00
Adam Powell
73a31ec91c Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 2011-05-20 12:59:43 -07:00
Dianne Hackborn
161e67ff3b resolved conflicts for merge of 06a8ceac to master 
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
 2011-05-19 21:44:52 -07:00
Dianne Hackborn
06a8ceacb0 am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:34:21 -07:00
Dianne Hackborn
c851ea5672 am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:30:32 -07:00
Adam Powell
8abebcde3f New opaque cab assets; search dialog tweaks. 
* New opaque assets (now actually opaque!)

* SearchDialog determines theme to use from parent context

* SearchDialog now disallows action modes

Change-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e
 2011-05-19 18:48:44 -07:00
Dianne Hackborn
69cb87576b Add new "-swNNNdp" resource qualifier. 
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
 2011-05-19 18:23:29 -07:00
Adam Powell
90177e59e5 am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'd40575eb983eb7a1d383acc1f30f467374acd085':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:17:30 -07:00
Adam Powell
d40575eb98 am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:06:09 -07:00
Jim Miller
74de8b923a Fix 4462497: Move layouts from xlarge to large to enable 7" tablets 
This fixes LockScreen on 7" tablets by moving the resources to xlarge.

In addition, it has some minor layout tweaks to center pattern and
wave unlock widgets on both so we can share the layout resources.

Change-Id: Ibeee9320c9effcae6cf55c9ca417854f468c8edb
 2011-05-19 17:05:30 -07:00
Adam Powell
dacbb746c9 DO NOT MERGE Action bar config changes 
Handle action bar padding on configuration changes when the app
handles these changes itself.

Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
 2011-05-19 15:38:27 -07:00
Adam Powell
c8f045b8a4 am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-18 19:16:31 -07:00
Adam Powell
d466a4631f am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 
* commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
 2011-05-18 19:14:44 -07:00
Adam Powell
67a0a6ab09 DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets. 
Change-Id: I56a75189ae48f04934882661ce5014549a089769
 2011-05-18 19:10:46 -07:00
Jim Miller
7a1eb5cf96 Merge "First pass at integrating new ScrollView-based recents panel. - added layout transitions - now calls removeTask() for selected activity." 2011-05-18 17:49:32 -07:00
Jim Miller
9f0f0e0e31 First pass at integrating new ScrollView-based recents panel. 
- added layout transitions
- now calls removeTask() for selected activity.

Change-Id: Ie57b3d79551353a564bb2e4da26243a10bb0198d
 2011-05-18 16:03:31 -07:00
Adam Powell
2e6b4ad76c resolved conflicts for merge of f61c3d07 to master 
Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
 2011-05-18 10:33:20 -07:00
John Reck
74bafe40d7 am c54d3a98: am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring 
* commit 'c54d3a987235c615715e45f5a22ba75e6fae22b3':
  Don't use mobile for large uastring
 2011-05-18 09:23:22 -07:00
Mike Lockwood
b6aabcf6e3 resolved conflicts for merge of 22c140b7 to master 
Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302
 2011-05-18 09:25:49 -04:00