Adam Powell
0e9e03f554
resolved conflicts for merge of a7d01a75 to master
...
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
2011-06-07 18:16:00 -07:00
Amith Yamasani
0df77e6d42
Merge "Volume Panel sizing for phones."
2011-06-07 14:48:50 -07:00
Fabrice Di Meglio
c46f7ffa90
Rename atribute View horizontalDirection to layoutDirection and update unit tests
...
- update before/after to start/end in unit test app
Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364
2011-06-07 14:21:31 -07:00
Mike Lockwood
65abc4531f
Merge "StorageVolume: Add allowMassStorage flag"
2011-06-07 12:44:52 -07:00
Mike Lockwood
8e8b280bd1
StorageVolume: Add allowMassStorage flag
...
Change-Id: I9d19e635bb06e50068d7e4e6919322bd5bb2e00f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 12:43:49 -07:00
Adam Powell
a7d01a7519
am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
...
* commit '212d15c746f2611339026c16e5fa1aeb7f9090b7':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
2011-06-07 11:36:32 -07:00
Adam Powell
212d15c746
am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
...
* commit 'a476813dccec241632810c1cbb11bcfbf17841b0':
Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
2011-06-07 11:32:23 -07:00
Adam Powell
a476813dcc
Make Theme.Holo.Light.NoActionBar and
...
Theme.Holo.Light.NoActionBar.Fullscreen public.
Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
2011-06-07 10:11:59 -07:00
Svetoslav Ganov
8643aa0179
Interrogation of the view hierarchy from an AccessibilityService.
...
1. Views are represented as AccessibilityNodeInfos to AccessibilityServices.
2. An accessibility service receives AccessibilityEvents and can ask
for its source and gets an AccessibilityNodeInfo which can be used
to get its parent and children infos and so on.
3. AccessibilityNodeInfo contains some attributes and actions that
can be performed on the source.
4. AccessibilityService can request the system to preform an action
on the source of an AccessibilityNodeInfo.
5. ViewAncestor provides an interaction connection to the
AccessibiltyManagerService and an accessibility service uses
its connection to the latter to interact with screen content.
6. AccessibilityService can interact ONLY with the focused window
and all calls are routed through the AccessibilityManagerService
which imposes security.
7. Hidden APIs on AccessibilityService can find AccessibilityNodeInfos
based on some criteria. These API go through the AccessibilityManagerServcie
for security check.
8. Some actions are hidden and are exposes only to eng builds for UI testing.
Change-Id: Ie34fa4219f350eb3f4f6f9f45b24f709bd98783c
2011-06-06 18:46:03 -07:00
Amith Yamasani
727d8fc0ba
Volume Panel sizing for phones.
...
Change-Id: I5a21b42740a3a3535504dc93c85b866c52cfb319
2011-06-06 17:30:10 -07:00
Eric Fischer
4297539155
Merge "Import revised translations."
2011-06-06 16:22:35 -07:00
Eric Fischer
f24004279a
Import revised translations.
...
Change-Id: I02300c0a71373654beb97bc96691438136bd3365
2011-06-06 15:51:43 -07:00
Jeff Brown
49470743fa
Merge "Copy pointer assets for hdpi."
2011-06-06 13:14:13 -07:00
Jeff Brown
44771f14ec
Copy pointer assets for hdpi.
...
Change-Id: I0012c651d8e550bbb0e2c75046f3138f7dd5f6a6
2011-06-06 13:03:25 -07:00
TK MUN
60a3117838
am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
...
* commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
Allow control over search order for tethering upstream interface selection
2011-06-06 12:57:24 -07:00
Nick Pelly
92279c0fa1
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-06-06 11:52:21 -07:00
TK MUN
51704fc9c2
am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
...
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
Allow control over search order for tethering upstream interface selection
2011-06-06 11:51:22 -07:00
Eric Fischer
e34ed24f4d
am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
Import revised translations. DO NOT MERGE
2011-06-06 11:50:16 -07:00
Eric Fischer
e9d32283e4
am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
Import revised translations. DO NOT MERGE
2011-06-06 10:54:41 -07:00
Eric Fischer
b5c6212de1
Import revised translations. DO NOT MERGE
...
Change-Id: I4bfd9ec60da3b224c71406851f0a7f8bbf0c1120
2011-06-03 17:24:55 -07:00
Jeff Brown
7218d830e2
resolved conflicts for merge of ca2b552d to master
...
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
2011-06-03 15:50:27 -07:00
Dianne Hackborn
ead40eaedb
resolved conflicts for merge of cc20b4e3 to master
...
Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4
2011-06-03 15:01:49 -07:00
Adam Powell
3c784fe6a0
am d19fbe34: am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
...
* commit 'd19fbe34e33fa79121e2822d0063f3aec350b3e5':
Fix bug 4501658 - adjust toast frame padding
2011-06-03 14:03:20 -07:00
Philip Milne
160cbbb9ac
Merge "Response to code review for GridLayout:"
2011-06-03 13:46:34 -07:00
Philip Milne
aa616f31fe
Response to code review for GridLayout:
...
. Fixed spelling.
. Added comments on internal methods.
. Adopted the suggested internal name changes to improve clarity.
. Added UNDEFINED constant to public API to avoid making reference to Integer.MAX_VALUE in docs.
. Added final everywhere, then removed it.
. Make the Interval class package private so that it can be put somewhere more general later.
. Tidy code, removing maximize flag throughout.
. Remove last of allocations taking place during layout.
. Implement measureChild() etc.
. Added LinearLayout alignment compatibility mode, and made it the default.
Change-Id: I6a4ffa022d97d68138d1903d3830a20278815435
https://android-git.corp.google.com/g/#change,109891
2011-06-03 13:22:52 -07:00
Amith Yamasani
99ce8abc3f
am 42f53c7e: am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
...
* commit '42f53c7e6cec8d17a850a550c74f8dfc9435fbf7':
Use Holo background and proper padding for App Permissions UI.
2011-06-03 11:11:22 -07:00
Eric Fischer
3124e6ebe7
Merge "Import revised translations."
2011-06-03 10:22:58 -07:00
Jeff Brown
ca2b552d98
am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
...
* commit 'c8812761609e532cceb400b112ed9982149c2490':
Add a preference panel for mouse speed.
2011-06-02 17:34:03 -07:00
Jeff Brown
c881276160
am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
...
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
Add a preference panel for mouse speed.
2011-06-02 17:28:07 -07:00
Eric Fischer
95cab5414d
Import revised translations.
...
Change-Id: Iffa8d66bf709a6daa6a3cd464ac55b6e34857d71
2011-06-02 16:54:11 -07:00
Jeff Brown
1a84fd1fb7
Add a preference panel for mouse speed.
...
Bug: 4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
2011-06-02 15:39:21 -07:00
Dianne Hackborn
546d64f56d
resolved conflicts for merge of 5c2e4d20 to master
...
Change-Id: Iadbee872468ceafb54c5877046c91f6052f3c953
2011-06-02 14:29:13 -07:00
Adam Powell
2e6053873b
Merge "Handle action modes in the IME extract mode view."
2011-06-02 13:36:02 -07:00
Adam Powell
5ee36c48be
Handle action modes in the IME extract mode view.
...
This presents action modes (such as the one for text editing) in a
less screen-consuming way in the IME extract mode layout. The submit
button is replaced by an "Edit..." button that shows the action mode
menu when clicked.
Still needs UX design and tweaking.
Change-Id: Ia7b3f3446edced0ee5a9abc5e2f0ff16f4fa3ab1
2011-06-02 13:29:37 -07:00
Dianne Hackborn
ed60f81940
resolved conflicts for merge of 76450622 to master
...
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
2011-06-02 09:20:52 -07:00
Ben Murdoch
368f2bd054
Merge "Merge WebKit at r80534: Update user agent string."
2011-06-02 03:03:15 -07:00
Dianne Hackborn
cc20b4e31e
am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
...
* commit 'a5f8851019605be26dd9a628280092e27f8a5f31':
Add new supports-screen API to set maximum allowed size.
2011-06-01 22:34:31 -07:00
Dianne Hackborn
a5f8851019
am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
...
* commit '2969b51132b80c873663aa2472b21d3e95845927':
Add new supports-screen API to set maximum allowed size.
2011-06-01 22:31:26 -07:00
Dianne Hackborn
2762ff3dc8
Add new supports-screen API to set maximum allowed size.
...
Change-Id: I0a7cd4ba73a4c18558e6daee28963d5fd12c7978
2011-06-01 22:20:38 -07:00
Adam Powell
8d02deabac
Implement bug 4500971 - Collapsable action views
...
Action views may now be flagged as 'collapsable'. This means that the
action menu will always show them in the collapsed state by
default. When selected, the action view will "take over" the
navigation/view side of an action bar until dismissed via the home/up
button.
This feature allows for more long-term exclusive modes akin to
ActionModes but less intrusive. The action menu itself remains
unaffected. Collapsable action views are ideal for things such as
search or categories of tool palettes.
Change-Id: Ibafce5631befbfe67c5d834c2e2617d3d7f6da7a
2011-06-01 17:48:04 -07:00
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
Gilles Debunne
829de65b9a
Merge "Select all for text shown as an icon on smaller screens"
2011-06-01 10:13:42 -07:00
Dianne Hackborn
36f80f3a5a
resolved conflicts for merge of 590ec479 to master
...
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
2011-05-31 23:11:16 -07:00
Adam Powell
f606167c7a
Fix bug 4501658 - adjust toast frame padding
...
Change-Id: I32fa68e27724ddb20f09a0ac99a497a97c425600
2011-05-31 17:59:02 -07:00
Gilles Debunne
5e9af2ddf0
Select all for text shown as an icon on smaller screens
...
Text has been removed to leave space for 4 icons, that should fit
even in portrait mode.
Note: requires a definitive selectAll icon from designers.
Change-Id: I65547527e9ca872aa8888467f31fa7de9653fa77
2011-05-31 17:05:33 -07:00
Adam Powell
60761f4fa5
am 31caa0e6: am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
...
* commit '31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
Updated popup dialog 9 patches (light)
2011-05-31 16:02:41 -07:00
Joe Onorato
6a045ca18f
Merge commit 'fce12613' into HEAD
...
Conflicts:
core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
core/res/res/layout/status_bar_latest_event_content_large_icon.xml
Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
2011-05-31 14:11: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