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

3369 Commits

Author SHA1 Message Date
Ben Murdoch
179c87f6e6 Merge WebKit at r84325: Update user agent string. 
Change-Id: I927bd1cfadb3cc5b68f93f761d4d82cdc4f54439
 2011-06-10 15:07:51 +01:00
Adam Powell
81cf3ecade Action buttons now use themable style. 
Obey action view layoutparams.

Change-Id: Ia466008465b57659615fbf9d450ce3fdb3c06379
 2011-06-09 22:01:16 -07:00
Adam Powell
fe93010446 Merge "Fix bug 4501881 - use correct TextAppearances for global actions" 2011-06-09 14:34:45 -07:00
Adam Powell
cbe7c3c20f Fix bug 4501881 - use correct TextAppearances for global actions 
Change-Id: Ie3751b92d145dd26d5211383982186af11c67b94
 2011-06-09 14:33:33 -07:00
John Wang
ec87aca649 am 3948a2b4: am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '3948a2b4205c36bc1b4a3911753d970248480742':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-09 13:55:20 -07:00
Adam Powell
0419ab9e4a resolved conflicts for merge of fb339016 to master 
Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac
 2011-06-09 12:15:10 -07:00
Dave Santoro
432513380e API modifications to handle profiles in Contacts. 
The user's profile is represented as a single Contact, comprised of
Raw Contacts which may be contributed from any accounts the user has on the
system.

Two new permissions have been added: READ_PROFILE and WRITE_PROFILE.  These are
required for reading or writing any contact data that is designated as part of
the user's profile.

Contact queries can include the user's profile data by setting the
include_profile URI parameter to 1 (this requires READ_PROFILE access).  By
default, the user's profile data will not be included in any Contact queries.

Change-Id: I25616f59622dbb157032c9c435064eb36af6e8e1
 2011-06-09 11:04:12 -07:00
Gilles Debunne
31bc2f9252 Merge "Add SwitchPreference" 2011-06-09 10:25:25 -07:00
Jake Hamby
d4f1bacca5 resolved conflicts for merge of 7ca13deb to master 
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
 2011-06-08 23:20:09 -07:00
John Wang
3948a2b420 am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-08 19:41:39 -07:00
John Wang
735463d1d9 Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE 2011-06-08 19:37:56 -07:00
Jim Miller
b0cdc2baa5 Fix layout issue on Xoom when device thinks there's a SIM. 
bug:4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
 2011-06-08 18:48:58 -07:00
Adam Powell
be0a453505 Add SwitchPreference 
Change-Id: I073e9bfba8c4e1a625c27f976f71ea56a81ba20f
 2011-06-08 18:25:27 -07:00
Adam Powell
fb339016ff am 73d54e7b: am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '73d54e7b54f95401ad290bf9d305cad449db7ae3':
  Public styles for action bar tabs
 2011-06-08 17:16:16 -07:00
Adam Powell
73d54e7b54 am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
  Public styles for action bar tabs
 2011-06-08 16:58:35 -07:00
Adam Powell
1a4678b93f Public styles for action bar tabs 
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
 2011-06-08 15:13:50 -07:00
John Wang
de13001f76 am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '1f8665895f71904b9d757854277cb637841356c3':
  Add SIM PUK unlockscreen.
 2011-06-08 14:46:04 -07:00
Chia-chi Yeh
ff3bdca31f The service part of the user space VPN support. 
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
 2011-06-08 14:16:42 -07:00
Steve Block
3dd389cf46 Merge "Merge WebKit at r82507: Update useragent string" 2011-06-08 08:26:13 -07:00
Steve Block
6dd1f8b946 Merge WebKit at r82507: Update useragent string 
Change-Id: Ie24ef844bdaf07a6aee848a04a49d0845b52ee64
 2011-06-08 15:17:10 +01:00
Adam Powell
0e9e03f554 resolved conflicts for merge of a7d01a75 to master 
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
 2011-06-07 18:16:00 -07:00
Jake Hamby
7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp 
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
 2011-06-07 15:01:50 -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
John Wang
1f8665895f am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
  Add SIM PUK unlockscreen.
 2011-06-07 13:16:09 -07:00
John Wang
71030e5365 Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 2011-06-07 12:56:49 -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
John Wang
0f7b3f8ba5 Add SIM PUK unlockscreen. 
Puk unlockscreen is implemented as SimPukUnlockScreen.

Added config_enable_puk_unlock_screen to control the display of puk unlock screen.

Using config_voice_capable to control the display of emergency call button.

bug:4384956

Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
 2011-06-07 10:12:38 -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
Jake Hamby
0cb17a52ee resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp 
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
 2011-06-06 15:33:37 -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