74369 Commits

Author SHA1 Message Date
Dianne Hackborn
79af6063d5 Merge "Hide the optional permission stuff, not making it in to JB." 2012-04-10 10:31:28 -07:00
Teng-Hui Zhu
450c75a59b am 6e32ebdf: (-s ours) am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility
* commit '6e32ebdff1365d754ad3ad8e156aa941d162d129':
  Update SurfaceTexture interface for forward compatibility
2012-04-10 09:13:54 -07:00
Teng-Hui Zhu
6e32ebdff1 am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility
* commit 'bbc46ae7499bc0fa67612c67dd23c1758336c935':
  Update SurfaceTexture interface for forward compatibility
2012-04-10 08:42:23 -07:00
Teng-Hui Zhu
bbc46ae749 am 544f89ae: Update SurfaceTexture interface for forward compatibility
* commit '544f89aece46e8f4bbe4eed93116c8736e68ac07':
  Update SurfaceTexture interface for forward compatibility
2012-04-10 08:38:39 -07:00
Teng-Hui Zhu
544f89aece Update SurfaceTexture interface for forward compatibility
Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464
2012-04-10 07:35:54 -07:00
Brian Colonna
0b2b1feaa2 Merge "Passing useLiveliness flag to FUL in startUi call" 2012-04-10 06:25:26 -07:00
Daniel Sandler
c38cf4c7db Merge "New Android Dreams architecture, disabled for now." 2012-04-10 05:33:07 -07:00
Scott Main
06cce88529 am 37250468: am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '372504684fa0f74c290e0eaf7134979a55118fea':
2012-04-09 23:59:12 -07:00
Scott Main
372504684f am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit 'be36ea9e04df8f3b97dec7793e37fa1d1465922b':
2012-04-09 23:55:47 -07:00
Jesse Hall
9d873d439f Merge "Avoid waking EGL in getInitCount" 2012-04-09 22:43:34 -07:00
Jesse Hall
3da2dc9d4c Merge "Release the scratch pbuffer surface after use" 2012-04-09 22:41:04 -07:00
Dianne Hackborn
02da1f27ed Merge "Fix issue #6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom" 2012-04-09 17:45:06 -07:00
Scott Main
0ffb60aa68 am 2f133265: am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '2f133265d0eb601885a608114b6bbc5b8a710f16':
2012-04-09 17:14:59 -07:00
Scott Main
99ae11bf8d am 14d3b807: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '14d3b807b730e04d90d6dd9c9569decdf12cc9cb':
  docs: Add 101 class about supporting various devices
2012-04-09 17:11:42 -07:00
Scott Main
2f133265d0 am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit 'b92851d850a778d1a2e5a797c2ddd315b61b15f9':
  docs: Add 101 class about supporting various devices
2012-04-09 17:11:21 -07:00
Scott Main
be36ea9e04 am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
  docs: Add 101 class about supporting various devices
2012-04-09 17:08:28 -07:00
Scott Main
b92851d850 am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
  docs: Add 101 class about supporting various devices
2012-04-09 17:08:11 -07:00
Scott Main
14d3b807b7 am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
  docs: Add 101 class about supporting various devices
2012-04-09 17:08:09 -07:00
Scott Main
a5894871b2 Merge "docs: Add 101 class about supporting various devices" into ics-mr1 2012-04-09 17:06:15 -07:00
John Grossman
8100960892 am e1d6c080: Make common_time more deferential when coming out of networkless mode.
* commit 'e1d6c080f0b1769637d742e51cc22167c7af12bb':
  Make common_time more deferential when coming out of networkless mode.
2012-04-09 17:00:24 -07:00
Adam Powell
2ac05e9c0f Merge "Restrictions for action buttons with text" 2012-04-09 16:49:47 -07:00
Scott Main
60e5e432d9 docs: Add 101 class about supporting various devices
Change-Id: Iafeb99c9dab8462236a41cc4991085062ff7fa14
2012-04-09 16:39:38 -07:00
Adam Powell
a7dec6d973 Restrictions for action buttons with text
Restrict action buttons with text to 2 lines max. Action buttons with
text will always consume at least 2 cells in split mode because they
look silly in 1.

Note that this affects text provided by menu items, not TextViews
embedded within app-provided action views.

Fixes bug 6236467

Change-Id: I7bcbf80f448b13a895ddc3bc6a7a555c0f0bac7c
2012-04-09 16:37:52 -07:00
Scott Main
9c8b381136 am 35c97085: am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit '35c97085008b6d6409afb62a2c452460f148d89c':
2012-04-09 16:28:58 -07:00
Dianne Hackborn
077ee85317 Fix issue #6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom
Change-Id: I5882e6f6ab249232b69bdc4b8e692716f2fe5efa
2012-04-09 16:27:07 -07:00
Scott Main
35c9708500 am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit '7ec02d7648a030edaf730b6d5ff04fe888009bc3':
2012-04-09 16:26:16 -07:00
George Mount
d408048641 Remove composing span after setting text.
Bug 5070241

Change-Id: I8cf7e5f119c7a828df603e91ba4bcf0f571bbc72
2012-04-09 15:46:55 -07:00
John Grossman
e1d6c080f0 Make common_time more deferential when coming out of networkless mode.
Addresses issues seen in bug 6260139.

This is a really tough bug to repro, but there is no doubt that it is
happening occasionally on our super huge A@H subnet.  I have collected
data all weekend; the failure did not occur, but I got enough to have
a theoretical sequence of events which could trigger this behavior.
The sequence goes like this.

1) A network is running and happy with a timeline master M,
   maintaining timeline X.
2) Device B boots, but its network is taking a long time to come up.
   After 60 seconds of waiting for the network to come up, device B
   goes into networkless master mode and creates timeline Y.
3) Device B's network comes up.  It immediately sends a master
   announcement saying that it is the current low-priority master of
   timeline Y (its low priority because it has never had any real
   clients)
4) Master M ignores B because B is low priority.
5) Device C boots and sends out a who is master request.  It is a race
   between M and A to see who will respond first.  In this case, A
   responds first.
6) C sends B a request which B receives.  B now has its first client
   and is now high priority.  In this scenario, B matches M in all
   aspects of the priority ranking function, including winning the tie
   breaker (larger MAC address when interpreted as a 48 bit integer)
7) M sends its master announcement; it is ignored by B since B
   now wins in the ranking function vs M.
8) Finally, B sends its next master announcement.  M sees it, realizes
   that there is a higher priority master out there (looks like a
   bridged network scenario to M).  M gives up master status along
   with timeline X.  The clients of M become clients of B and move
   from timeline X to timeline Y (something which should only be
   needed during an actual network bridging event)

This change has a few different things meant to severely minimize the
chance that this can happen.

First, and the most important change, is that networkless masters do
not immediately announce themselves as masters on the network they are
joining.  Instead, they transition into Ronin to discover any
pre-existing masters on the network.  If there are no masters out
there, the device will simply transition back to master and continue
to maintain the timeline it had in networkless mode.  In the scenario
above, however, B should discover M and become its client, preserving
the established timeline X.

Second, any time a device experienced an interface reconfiguration
(including coming out of networkless mode), it clears its high
priority bit.  This is a good thing.  The bit used to get set again
any time...

1) The device is master and receives a client request.
2) The device becomes a client of another master on the network.
3) The device becomes a master.

Number 3 in this list is a mistake.  The high priority bit should only
be set for devices during master election which have been
participating in a timeline which has been used by multiple devices.
We know that this is the case when we are master and receive a
request.  We also know that this is the case when we hear from a
master and decide to become its client.  Simply becoming a master
should not make us high priority.  This behavior has been removed.

Third, timeouts have been adjusted just for some extra "stickyness"
when it comes to master status.  Clients now say in the Ronin state
for up to 10 seconds looking for a master sending up to 20 discovery
requests, instead of only 3 seconds (sending 6 requests).  The
wait-for-election timeout has been adjusted up from 5 seconds to 12.5
seconds to track the longer election cycle as well.  Also, while in
steady-state, clients will now wait until 10 packets (10 seconds)
have not been answered by its master before giving up and dropping
into Ronin.

Change-Id: I438b39f31265e34d6719d4adfa9e8b95a2afc188
Signed-off-by: John Grossman <johngro@google.com>
2012-04-09 15:33:53 -07:00
Scott Main
cbcb24cdb8 am 40a081a0: am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit '40a081a0d7c1f88f2614ae6343cd253cd8d50e6f':
2012-04-09 15:31:24 -07:00
Scott Main
40a081a0d7 am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit '5e555df1b13c030a5b9a720afc59b53be8dc02d5':
  docs: fix NDK r7c release data and remove "new" tag
2012-04-09 15:27:22 -07:00
Scott Main
3a66ef5ee9 am faef0d0f: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit 'faef0d0f648570dae5e919e8cb2d9096861f2491':
  docs: fix NDK r7c release data and remove "new" tag
2012-04-09 15:27:21 -07:00
Scott Main
faef0d0f64 am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag
2012-04-09 15:24:17 -07:00
Scott Main
7ec02d7648 am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag
2012-04-09 15:24:13 -07:00
Scott Main
5e555df1b1 am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag
2012-04-09 15:23:57 -07:00
Scott Main
ede62bb6ee Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 2012-04-09 15:21:53 -07:00
Scott Main
71bd123145 am 8432ab2e: am 372e667c: am ae01af5e: docs: fix a few link titles in tv class
* commit '8432ab2e3f52a15693a39e5d135dabbca9848ef4':
2012-04-09 15:16:36 -07:00
Scott Main
b75d4798a8 am ae94f0b3: am 9f6176ee: am ae01af5e: docs: fix a few link titles in tv class
* commit 'ae94f0b3d80fd076344f86b9500ce671b7bd1c0d':
2012-04-09 15:16:34 -07:00
Scott Main
4b102249a6 am 99140419: am 7e9fbe11: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1
* commit '99140419010093817f329e2c670557d769507842':
2012-04-09 15:16:31 -07:00
Scott Main
98956cdd18 am 371704ed: am fd41f154: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1
* commit '371704ed05a4b454a5eafcb13335dbf144181b0f':
2012-04-09 15:16:28 -07:00
Irfan Sheriff
7405b90df4 Merge "P2p fixes" 2012-04-09 14:29:01 -07:00
Wink Saville
cbc41deaa3 Merge "Telephony: Fix NV ready state" 2012-04-09 14:22:13 -07:00
Eric Fischer
e80203959d Merge "Import translations. DO NOT MERGE" 2012-04-09 14:09:23 -07:00
Eric Fischer
310ee7cf49 Import translations. DO NOT MERGE
Change-Id: I9299202c20b57a4bbdee61cc1db3cb3d7cefb762
2012-04-09 13:54:59 -07:00
Wink Saville
283be25869 Merge "Add some additional debug for set operator numeric." 2012-04-09 13:41:49 -07:00
Scott Main
8432ab2e3f am 372e667c: am ae01af5e: docs: fix a few link titles in tv class
* commit '372e667cbe3503598635387136cf299d5dfffcf9':
2012-04-09 13:39:46 -07:00
Brian Colonna
f66e930e72 Passing useLiveliness flag to FUL in startUi call
Because of changes in support of multi-user functionaity, the FUL
'eye blink' checkbox was no longer enabling liveliness detection.

It no longer makes sense to check the biometric flags (such as the
liveliness flag) inside of the Face Unlock service.  Instead, that
flag is now passed in from lockscreen via the aidl interface when
startUi is called.

Change-Id: I591cf1924fbb24da7d54b94ef29824e5197d3b20
2012-04-09 16:36:28 -04:00
Gilles Debunne
425c726ae0 Merge "More minor refactoring in SpannableStringBuilder" 2012-04-09 13:27:11 -07:00
Brian Colonna
82920edd89 Merge "Separated FUL functionality from LockPatternKeyguardView" 2012-04-09 13:25:37 -07:00
Scott Main
d9b2070f5c am ec73b7c5: am ae01af5e: docs: fix a few link titles in tv class
* commit 'ec73b7c5e615f0e85af3f1127fc1e5d4cbd41780':
  docs: fix a few link titles in tv class
2012-04-09 13:18:35 -07:00
Victoria Lease
63b81472a3 Merge "Make WebView.findAllAsync() and WebView.setFindListener() public." 2012-04-09 13:14:28 -07:00