OSDN Git Service
Victoria Lease [Thu, 29 Nov 2012 19:13:25 +0000 (11:13 -0800)]
am
7023b3b0: Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev
* commit '
7023b3b0608e20bb881db9184c10ccfea7941332':
clarify Geofence.createCircle() param ranges
Victoria Lease [Thu, 29 Nov 2012 19:09:03 +0000 (11:09 -0800)]
Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev
Christopher Tate [Thu, 29 Nov 2012 18:58:26 +0000 (10:58 -0800)]
am
5f958e9b: am
67b38c44: Cache resource ID lookups in aapt
* commit '
5f958e9bfc793b3b653dfc88418bbd7745e633e1':
Cache resource ID lookups in aapt
Christopher Tate [Thu, 29 Nov 2012 18:55:52 +0000 (10:55 -0800)]
am
67b38c44: Cache resource ID lookups in aapt
* commit '
67b38c44e8b04b97e357664804d593823b2a34ed':
Cache resource ID lookups in aapt
Craig Mautner [Thu, 29 Nov 2012 17:59:45 +0000 (09:59 -0800)]
am
24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev
* commit '
24d966a3b6a0407076b333ec2e074160b2311cb2':
Fix math errors causing black screen. DO NOT MERGE
Craig Mautner [Thu, 29 Nov 2012 17:57:14 +0000 (09:57 -0800)]
Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev
zzy [Thu, 29 Nov 2012 08:30:28 +0000 (00:30 -0800)]
am
652678af: timeout support for accept() and added check for signal size
* commit '
652678af4d18b9a6c18ce6a860de01d958bc82fe':
timeout support for accept() and added check for signal size
Craig Mautner [Thu, 15 Nov 2012 22:25:14 +0000 (14:25 -0800)]
Fix math errors causing black screen. DO NOT MERGE
Turning off animations in the Developer options creates a ValueAnimator
duration scale of 0. This is used as the denominator in RampAnimator
which, if the numerator is also 0, sets mAnimatedValue to NaN. Rounding
NaN to the nearest int produces 0 which is then assigned to
mScreenBrightness in DisplayPowerState.
A copy mistake which assigned mTransitionAnimationScale as the default
value for mAnimatorDurationScale in WindowManagerService is also
fixed here.
Bug
7515609 fixed.
Change-Id: I39f8d0a7abdd5a1fe70d757fe95fbddaf7a0ed51
zzy [Thu, 22 Nov 2012 19:52:44 +0000 (11:52 -0800)]
timeout support for accept() and added check for signal size
bug
7592240
Change-Id: Ide1868da669c190cdfed90f7af3f739ec9da690b
Fabrice Di Meglio [Thu, 29 Nov 2012 03:50:49 +0000 (19:50 -0800)]
am
cdc6d5cf: Merge "Fix bug #
7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
* commit '
cdc6d5cf88e8eb73a557052679c436e864cb1853':
Fix bug #
7617883 RelativeLayout is not having the correct width when in RTL mode
Adam Powell [Thu, 29 Nov 2012 03:50:46 +0000 (19:50 -0800)]
am
66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
* commit '
66cedab63bf0c17e59a5815200bd9200164d89ec':
Fix time-related ScaleGestureDetector methods
Adam Powell [Thu, 29 Nov 2012 03:50:43 +0000 (19:50 -0800)]
am
10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
* commit '
10479a29cbdc55cfd25b30cd792a151234b55fa6':
Clean up behavior of type arguments for MediaRouter#getSelectedRoute
Adam Powell [Thu, 29 Nov 2012 03:50:35 +0000 (19:50 -0800)]
am
738b1903: Merge "Import assets from UX" into jb-mr1.1-dev
* commit '
738b19033850df899c20865ba4152a6028b3bb23':
Import assets from UX
Dianne Hackborn [Thu, 29 Nov 2012 03:48:57 +0000 (19:48 -0800)]
Fabrice Di Meglio [Thu, 29 Nov 2012 03:08:33 +0000 (19:08 -0800)]
Merge "Fix bug #
7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
Adam Powell [Thu, 29 Nov 2012 03:06:50 +0000 (19:06 -0800)]
Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
Adam Powell [Thu, 29 Nov 2012 03:02:37 +0000 (19:02 -0800)]
Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
Adam Powell [Thu, 29 Nov 2012 02:49:12 +0000 (18:49 -0800)]
Merge "Import assets from UX" into jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 02:46:45 +0000 (18:46 -0800)]
Fix build.
Change-Id: Icc1f2913b4e889609066b0ff1dddcd9be0230897
Adam Powell [Thu, 29 Nov 2012 02:41:10 +0000 (18:41 -0800)]
Import assets from UX
Fixes issues with scaling/dithering artifacts in dialog/menu panel
assets.
Bug
7589786
Change-Id: I1285f9de5f8bcd0decfa7765c1463e444a56b335
Adam Powell [Thu, 29 Nov 2012 02:29:22 +0000 (18:29 -0800)]
Fix time-related ScaleGestureDetector methods
Bug
7626515
Change-Id: Ie7abf9c166284a74b4e7bcf9de25520cf08e3b2d
Dianne Hackborn [Thu, 29 Nov 2012 02:21:47 +0000 (18:21 -0800)]
am
860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev
* commit '
860d0cd452529e7a01152582e6535c2129a46af7':
Cleaner initial boot.
Dianne Hackborn [Thu, 29 Nov 2012 02:19:09 +0000 (18:19 -0800)]
Merge "Cleaner initial boot." into jb-mr1.1-dev
Chris Craik [Thu, 29 Nov 2012 02:18:36 +0000 (18:18 -0800)]
am
2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
* commit '
2435f98d91c2760ba94bb7806d24e4c03e8d8fd9':
Use the same interrupt/resume logic for all functor calls
Adam Cohen [Thu, 29 Nov 2012 02:18:32 +0000 (18:18 -0800)]
am
035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
* commit '
035352b4d62e259c86576dd3d1495b21bed172ff':
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Chris Craik [Thu, 29 Nov 2012 02:11:22 +0000 (18:11 -0800)]
Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 02:05:36 +0000 (18:05 -0800)]
Cleaner initial boot.
This does some cleanup of the initial boot, especially when
booting in "no core apps" mode for encryption/decryption.
Change-Id: Ifb3949f580e52f54559e603c4b0b104f6bac2f6c
Adam Cohen [Thu, 29 Nov 2012 01:47:22 +0000 (17:47 -0800)]
Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
Robert Greenwalt [Thu, 29 Nov 2012 01:42:50 +0000 (17:42 -0800)]
am
5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
* commit '
5a36e06ab2289073980b6147e13c8c03b94e5a80':
Secure a handful of framework broadcasts
Robert Greenwalt [Thu, 29 Nov 2012 01:40:02 +0000 (17:40 -0800)]
Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
Fabrice Di Meglio [Tue, 27 Nov 2012 04:05:31 +0000 (20:05 -0800)]
Fix bug #
7617883 RelativeLayout is not having the correct width when in RTL mode
- fix onMeasure() in RTL mode: need to compute width before computing layout params
that are used for layout
- fix getRelatedView() so that it uses the resolved rules
- add some extra "final" statements
Change-Id: I7c3bf841cd18c5f77b010a9be20fa78069e88d94
Robert Greenwalt [Thu, 29 Nov 2012 00:42:32 +0000 (16:42 -0800)]
Secure a handful of framework broadcasts
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.
bug:
7622253
Change-Id: Id8ec2778b15fe001e6fd0d5a010181bb21c52ad8
Adam Cohen [Thu, 29 Nov 2012 00:34:57 +0000 (16:34 -0800)]
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Change-Id: I25acb7bde2e8e5ac3185a009f5c7151b81f0ae19
Irfan Sheriff [Thu, 29 Nov 2012 00:30:53 +0000 (16:30 -0800)]
am
b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
* commit '
b4d5a9e73b51671e25b176310bd69f2d43a1167f':
WFD: Fallback to PIN mode if PBC is not supported
Irfan Sheriff [Thu, 29 Nov 2012 00:28:40 +0000 (16:28 -0800)]
Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
Irfan Sheriff [Wed, 28 Nov 2012 23:54:06 +0000 (15:54 -0800)]
WFD: Fallback to PIN mode if PBC is not supported
Bug:
7627641
Change-Id: Ibba6114f907c67f1cb60c460d5b65479f2d1b148
Christopher Tate [Fri, 16 Nov 2012 23:58:08 +0000 (15:58 -0800)]
Cache resource ID lookups in aapt
This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK. Windows-based
use should particularly benefit from the change.
(cherry picked from commit
d8dde13a63565dcd72bcf03a5088407b737ba793)
Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd
Fabrice Di Meglio [Wed, 28 Nov 2012 23:08:12 +0000 (15:08 -0800)]
am
71175f72: Merge "Fix bug #
7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
* commit '
71175f727bc1e094e72a410aca62392badffbf11':
Fix bug #
7621927 Radio button/TextView drawable regression in 4.2
Dianne Hackborn [Wed, 28 Nov 2012 23:06:36 +0000 (15:06 -0800)]
am
68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev
* commit '
68e0da7e397f6808a90509615c08c62bb00af6ba':
Quiet down a lot of logging.
Fabrice Di Meglio [Wed, 28 Nov 2012 23:05:53 +0000 (15:05 -0800)]
Merge "Fix bug #
7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
Dianne Hackborn [Wed, 28 Nov 2012 23:03:39 +0000 (15:03 -0800)]
Merge "Quiet down a lot of logging." into jb-mr1.1-dev
Chris Craik [Wed, 28 Nov 2012 22:45:04 +0000 (14:45 -0800)]
Use the same interrupt/resume logic for all functor calls
bug:
7093396
The functor was able to change the renderer's blend mode without it
being restored in process mode. This single path of updating gl caches
reduces likelihood of this occurring in the future.
Change-Id: Ie367532f9c683299f02bc4f635d7cb31f96db39f
Scott Main [Wed, 28 Nov 2012 21:19:36 +0000 (13:19 -0800)]
am
ceafd15d: am
23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
* commit '
ceafd15df99ed77c9e9ed5e93d2c1f062a095169':
docs: revisions to gps landing pages
Dirk Dougherty [Wed, 28 Nov 2012 21:19:30 +0000 (13:19 -0800)]
am
37f00afa: am
f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
* commit '
37f00afa4fe49730a9f7d3220c509247fd12828c':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
Scott Main [Wed, 28 Nov 2012 21:17:36 +0000 (13:17 -0800)]
am
23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
* commit '
23cc5d99fcb97c5a369b3ddf7f90505f6bb29363':
docs: revisions to gps landing pages
Dirk Dougherty [Wed, 28 Nov 2012 21:17:28 +0000 (13:17 -0800)]
am
f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
* commit '
f4d44618aa43b85c8a2a5bdd95e7454e2736452a':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
Scott Main [Wed, 28 Nov 2012 21:14:45 +0000 (13:14 -0800)]
Merge "docs: revisions to gps landing pages" into jb-mr1-dev
Dirk Dougherty [Wed, 28 Nov 2012 21:14:03 +0000 (13:14 -0800)]
Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
Brian Colonna [Wed, 28 Nov 2012 20:48:32 +0000 (12:48 -0800)]
am
6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/
7572354" into jb-mr1.1-dev
* commit '
6f6facc17812fe529f3de0b75de5f9011d73eacc':
Ignoring FUL unlock signal if user changed fixes b/
7572354
Brian Colonna [Wed, 28 Nov 2012 20:46:13 +0000 (12:46 -0800)]
Merge "Ignoring FUL unlock signal if user changed fixes b/
7572354" into jb-mr1.1-dev
Zhihai Xu [Wed, 28 Nov 2012 20:21:11 +0000 (12:21 -0800)]
am
e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
* commit '
e3f7c45241a90d3e4b76d28911831f5dcbaaa038':
Settings shows it is connected to A2DP, though the device is not actually connected
Zhihai Xu [Wed, 28 Nov 2012 20:19:41 +0000 (12:19 -0800)]
Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
Fabrice Di Meglio [Wed, 28 Nov 2012 01:44:33 +0000 (17:44 -0800)]
Fix bug #
7621927 Radio button/TextView drawable regression in 4.2
- as we remove the 9 patch padding trick, we need also to do the correct
positioning of the radio / checkbox / star during draw
Change-Id: I02b67bef9c0f2dc1c0c65361de14ab20ce9b881d
Adam Powell [Wed, 28 Nov 2012 19:29:51 +0000 (11:29 -0800)]
am
f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
* commit '
f3a39f2df40503e8e3a91937f9f5f33b43528274':
Remove overzealous mutate() sanity check in LayerDrawable
Adam Powell [Wed, 28 Nov 2012 19:27:09 +0000 (11:27 -0800)]
Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
Zhihai Xu [Wed, 28 Nov 2012 19:26:08 +0000 (11:26 -0800)]
am
5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev
* commit '
5c0f3e5075c8ac8b22bbaeb32bddfada9657577a':
Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
Scott Main [Wed, 28 Nov 2012 19:01:37 +0000 (11:01 -0800)]
docs: revisions to gps landing pages
Change-Id: Ie9f2cf526a3ea328ce22dfb208e7eb95add56d0b
Zhihai Xu [Wed, 28 Nov 2012 19:21:39 +0000 (11:21 -0800)]
Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev
Adam Powell [Wed, 28 Nov 2012 18:46:56 +0000 (10:46 -0800)]
Clean up behavior of type arguments for MediaRouter#getSelectedRoute
MediaRouter's policy so far has been around a single selected route,
but when route types are entirely orthogonal this should not be the
case. However we still don't want to get into a situation where we
have multiple, very different routes selected for different types at
the same time, we still want to have more of an element of
predictability.
Behavior of getSelectedRoute is now:
* If the selected route matches at least one type with the requested
type flags, it is still considered selected for that request.
* If the caller specifically requested the selected user route and the
currently selected route is not a user route, return null.
* If the requested type flags do not match any types with the selected
route, return the default system route.
Note that this is "any" behavior instead of "all" - this matches
existing usage of the method. We may consider adding an "all" variant
later on.
Bug
7588042
Change-Id: I3a79d8153ca6b882fd3ef6b9b1de8f538873dec2
Scott Main [Wed, 28 Nov 2012 18:43:22 +0000 (10:43 -0800)]
am
7538ff09: am
35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev
* commit '
7538ff0920a8cbdfe68885221d1275633eafc613':
docs: update dreamservice description
Scott Main [Wed, 28 Nov 2012 18:40:18 +0000 (10:40 -0800)]
am
35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev
* commit '
35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663':
docs: update dreamservice description
Scott Main [Wed, 28 Nov 2012 18:05:30 +0000 (10:05 -0800)]
Merge "docs: update dreamservice description" into jb-mr1-dev
Andreas Huber [Wed, 28 Nov 2012 17:43:29 +0000 (09:43 -0800)]
am
f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev
* commit '
f0afad008bf78576ff364bcd8bc93b7aa8090b34':
Stop caching stream duration, it might change (increase) dynamically.
Andreas Huber [Wed, 28 Nov 2012 17:38:45 +0000 (09:38 -0800)]
Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev
Daniel Sandler [Wed, 28 Nov 2012 14:28:13 +0000 (06:28 -0800)]
am
c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev
* commit '
c7f55f5595fb6ffdec7796e801545156aefd3655':
New timings for default & fallback notification vibration.
Daniel Sandler [Wed, 28 Nov 2012 14:22:53 +0000 (06:22 -0800)]
Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev
Dianne Hackborn [Wed, 28 Nov 2012 03:12:23 +0000 (19:12 -0800)]
Quiet down a lot of logging.
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).
Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
Daniel Sandler [Wed, 28 Nov 2012 02:41:01 +0000 (18:41 -0800)]
am
bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
* commit '
bf0e106a7d755355d7ff53a2b319e2e91c154641':
Cleanups in Notification.java.
Daniel Sandler [Wed, 28 Nov 2012 02:38:32 +0000 (18:38 -0800)]
Merge "Cleanups in Notification.java." into jb-mr1.1-dev
Daniel Sandler [Wed, 28 Nov 2012 02:17:45 +0000 (18:17 -0800)]
am
54525d8e: Merge "Clean up the Builder test." into jb-mr1.1-dev
* commit '
54525d8e4b2bcffcf33b5df8292e9ec45b9aaa3d':
Clean up the Builder test.
Daniel Sandler [Wed, 28 Nov 2012 02:16:10 +0000 (18:16 -0800)]
am
5bff5517: Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev
* commit '
5bff551710d2f2b9d7c6ea814b18b042ee0fe663':
Refresh the status bar clock format on user switch.
Daniel Sandler [Wed, 28 Nov 2012 02:13:11 +0000 (18:13 -0800)]
Merge "Clean up the Builder test." into jb-mr1.1-dev
Daniel Sandler [Wed, 28 Nov 2012 02:12:47 +0000 (18:12 -0800)]
Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev
kmccormick@google.com [Wed, 28 Nov 2012 01:00:27 +0000 (17:00 -0800)]
am
1f301634: am
58d55b04: am
d60ea46f: am
a880436f: am
b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
* commit '
1f301634d3a9765decad91327d732064f11aae77':
Doc update: new Notify User AU class
kmccormick@google.com [Wed, 28 Nov 2012 00:57:51 +0000 (16:57 -0800)]
am
58d55b04: am
d60ea46f: am
a880436f: am
b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
* commit '
58d55b0456a72daaf31c4e02227e82a8707ecf73':
Doc update: new Notify User AU class
kmccormick@google.com [Wed, 28 Nov 2012 00:56:03 +0000 (16:56 -0800)]
am
d60ea46f: am
a880436f: am
b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
* commit '
d60ea46fe7a9856ca592ff7dea79aa8ce80f5e66':
Doc update: new Notify User AU class
kmccormick@google.com [Wed, 28 Nov 2012 00:54:01 +0000 (16:54 -0800)]
am
a880436f: am
b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
* commit '
a880436f4416168d256822a23bd23f936136706d':
Doc update: new Notify User AU class
kmccormick@google.com [Wed, 28 Nov 2012 00:52:00 +0000 (16:52 -0800)]
am
b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
* commit '
b7863a3ce4db964322783ff7e84acc5713e04d1d':
Doc update: new Notify User AU class
&& repo sync -j8 [Wed, 28 Nov 2012 00:49:36 +0000 (16:49 -0800)]
Merge "Doc update: new Notify User AU class" into jb-dev-docs
&& repo sync -j8 [Thu, 4 Oct 2012 23:34:23 +0000 (16:34 -0700)]
Doc update: new Notify User AU class
Change-Id: Idcda9535c5aa2602cf4f0aecb3ab4b1518ab966b
Robert Ly [Wed, 28 Nov 2012 00:36:35 +0000 (16:36 -0800)]
am
e3a94e9d: am
d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev
* commit '
e3a94e9dd21c002b003ec1a946e2ec6df25c9e0d':
docs: add new GMS landing and reference
Robert Ly [Wed, 28 Nov 2012 00:35:19 +0000 (16:35 -0800)]
am
d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev
* commit '
d29457e40379d6df0cbf8bbbe5945f0827a0d19c':
docs: add new GMS landing and reference
Robert Ly [Wed, 28 Nov 2012 00:32:04 +0000 (16:32 -0800)]
Merge "docs: add new GMS landing and reference" into jb-mr1-dev
Dirk Dougherty [Sun, 14 Oct 2012 00:15:20 +0000 (17:15 -0700)]
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
Change-Id: I45de360c45426ab6d2e04ef6a9e5fa920ff63c57
Daniel Sandler [Wed, 28 Nov 2012 00:22:22 +0000 (19:22 -0500)]
New timings for default & fallback notification vibration.
Bug:
7599791
Change-Id: Ieae1cba864537b192be013e4f00131bcc59c6369
Craig Mautner [Wed, 28 Nov 2012 00:20:34 +0000 (16:20 -0800)]
am
9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev
* commit '
9e98927e2dd3e9498753e6878709b2625e96feea':
Retain configuration change info and sync access.
Craig Mautner [Wed, 28 Nov 2012 00:17:45 +0000 (16:17 -0800)]
Merge "Retain configuration change info and sync access." into jb-mr1.1-dev
Dirk Dougherty [Wed, 28 Nov 2012 00:10:07 +0000 (16:10 -0800)]
am
b544af37: am
5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
* commit '
b544af3796b43afa9ae6f2196df569de175e0d24':
Doc change: fix typo in jb docs.
Robert Ly [Wed, 14 Nov 2012 21:26:28 +0000 (13:26 -0800)]
docs: add new GMS landing and reference
Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba
Dirk Dougherty [Wed, 28 Nov 2012 00:08:00 +0000 (16:08 -0800)]
am
5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
* commit '
5f8c2dfebe23d4a0a212138b2243059c24940d21':
Doc change: fix typo in jb docs.
Dirk Dougherty [Wed, 28 Nov 2012 00:06:10 +0000 (16:06 -0800)]
Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
Dirk Dougherty [Tue, 27 Nov 2012 23:59:37 +0000 (15:59 -0800)]
Doc change: fix typo in jb docs.
Change-Id: I1e9820685eb8f1aa5580643215f5a7edd0c99c07
Bug:
7621378
Andreas Huber [Tue, 27 Nov 2012 23:06:56 +0000 (15:06 -0800)]
Stop caching stream duration, it might change (increase) dynamically.
Change-Id: Ia829f47602e6961f24464da36a0162b8c1d7d6c8
related-to-bug:
6870049
Amith Yamasani [Tue, 27 Nov 2012 23:40:36 +0000 (15:40 -0800)]
am
f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev
* commit '
f426ace9dab65c88b36a047bf921070edcf8cf61':
Only wipe device if primary user (for failed password attempts)
Amith Yamasani [Tue, 27 Nov 2012 23:37:40 +0000 (15:37 -0800)]
Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev
Michael Jurka [Tue, 27 Nov 2012 22:51:45 +0000 (14:51 -0800)]
am
09a526fa: Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev
* commit '
09a526faf311f77017f37af3fe8aba45bc2c32fb':
Fix bug: swiped apps in Recents come back on rotate
Michael Jurka [Tue, 27 Nov 2012 22:49:41 +0000 (14:49 -0800)]
Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev
Baligh Uddin [Tue, 27 Nov 2012 21:27:27 +0000 (13:27 -0800)]
am
4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
4df6c6292b9bfa35ece3c09d5094a7f4089c5029':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 21:25:49 +0000 (13:25 -0800)]
am
18a4aa89: am
c8d2abd8: Import translations. DO NOT MERGE
* commit '
18a4aa8996891648bc0c9d7a5bed3b3bf28acdec':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 21:21:02 +0000 (13:21 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
OSDN Git Service
