7464 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
John Spurlock	ef512efbeb	am 09e97989: am b54b45d9: Merge "Re-enable dreams: Settings" into jb-mr1-dev ... * commit '09e97989f4d8846a202a8324e98a10ac52c543e6': Re-enable dreams: Settings	2012-08-03 08:57:59 -07:00
John Spurlock	09e97989f4	am b54b45d9: Merge "Re-enable dreams: Settings" into jb-mr1-dev ... * commit 'b54b45d93ba378ef91e551f1073888de55b9e982': Re-enable dreams: Settings	2012-08-03 08:55:53 -07:00
John Spurlock	b54b45d93b	Merge "Re-enable dreams: Settings" into jb-mr1-dev	2012-08-03 08:53:22 -07:00
Michael Jurka	8c20dcf1df	am 8ce21bdb: am 6e380d08: am 3d43f9c8: am ca511a81: Fix appwidget bind dialog ... * commit '8ce21bdbd2a9d20cd88bfd491e7281114cc77cfa': Fix appwidget bind dialog	2012-08-02 22:35:22 -07:00
Michael Jurka	8ce21bdbd2	am 6e380d08: am 3d43f9c8: am ca511a81: Fix appwidget bind dialog ... * commit '6e380d0865e397e251f516c7ccefedf26ed8801d': Fix appwidget bind dialog	2012-08-02 22:34:13 -07:00
Michael Jurka	6e380d0865	am 3d43f9c8: am ca511a81: Fix appwidget bind dialog ... * commit '3d43f9c8aa2b00d894577e5b6dfe3ffcdfc9d871': Fix appwidget bind dialog	2012-08-02 22:31:34 -07:00
Michael Jurka	3d43f9c8aa	am ca511a81: Fix appwidget bind dialog ... * commit 'ca511a8115962be7f598deb20aa47793db6d06f7': Fix appwidget bind dialog	2012-08-02 22:29:23 -07:00
Michael Jurka	ca511a8115	Fix appwidget bind dialog ... Bug: 6926529 Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12	2012-08-02 18:36:42 -07:00
The Android Open Source Project	3e3da16333	am 34ef420a: (-s ours) Reconcile with jb-mr1-release - do not merge ... * commit '34ef420a1e99fda1b361f9552c1e8a0450db0715':	2012-08-02 15:09:10 -07:00
John Spurlock	d541b6fd1c	Re-enable dreams: Settings ... Re-arrange settings and captions for dreams. Activation on sleep and activation on dock now independent. Sleep activation defaults to off, dock activation defaults to on (replacing dock mode). Also use dream manager service for testing dream preference, and properly disable preferences if both dream activations are disabled. Change-Id: I76f5ba115c7678826a09077dd393acc55c2bca26 Bug: 6921930	2012-08-02 16:49:23 -04:00
The Android Open Source Project	34ef420a1e	Reconcile with jb-mr1-release - do not merge ... Change-Id: Ic1a68162e9f5c0d65ef87216a47d17a7c4b52c27	2012-08-02 11:27:20 -07:00
The Android Automerger	d6b4c99a2f	merge in jb-mr1-release history after reset to jb-mr1-dev	2012-08-02 08:18:19 -07:00
Ying Wang	f9c28b59fd	am 4c0ad89c: (-s ours) am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE ... * commit '4c0ad89c169af0d2841de1924c5fe1dd6931e6a0': Import translations. DO NOT MERGE	2012-08-01 15:36:04 -07:00
Ying Wang	4c0ad89c16	am 6a20ce5e: am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE ... * commit '6a20ce5e515141b0934bd4093dbad53c14a19a6e': Import translations. DO NOT MERGE	2012-08-01 15:34:00 -07:00
Ying Wang	099e9c017b	am 3b290bc0: (-s ours) am 4c9e26b0: Import translations. DO NOT MERGE ... * commit '3b290bc0178fc211fb70d969848d5a392944f828': Import translations. DO NOT MERGE	2012-08-01 15:32:17 -07:00
Ying Wang	6a20ce5e51	am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE ... * commit '91840c02361af8157b0c0395fafe704edab2e498': Import translations. DO NOT MERGE	2012-08-01 15:30:23 -07:00
Ying Wang	cb12d7f68d	Merge "Import translations. DO NOT MERGE"	2012-08-01 15:30:23 -07:00
Ying Wang	3b290bc017	am 4c9e26b0: Import translations. DO NOT MERGE ... * commit '4c9e26b0d2ebee28027de0703fbdc9195166ba72': Import translations. DO NOT MERGE	2012-08-01 15:29:02 -07:00
Ying Wang	91840c0236	am d7ae05db: Import translations. DO NOT MERGE ... * commit 'd7ae05dbdc1af637e7e6655abb1a6b63e9d49968': Import translations. DO NOT MERGE	2012-08-01 15:28:32 -07:00
Ying Wang	3a4cdfc58a	Import translations. DO NOT MERGE ... Change-Id: Id0a6b06f181160927a341412ce78ed11bbdae615 Auto-generated-cl: translation import	2012-08-01 14:18:26 -07:00
Ying Wang	4c9e26b0d2	Import translations. DO NOT MERGE ... Change-Id: I944d4e01e1453965b386dd8f49450fb2f7dd2d4e Auto-generated-cl: translation import	2012-08-01 14:15:14 -07:00
Ying Wang	d7ae05dbdc	Import translations. DO NOT MERGE ... Change-Id: I581b48ef0f69e5bd2c469fd2ac61a8c5564bc553 Auto-generated-cl: translation import	2012-08-01 14:13:16 -07:00
Justin Koh	0962a5cf35	am 7b065464: Move BT settings appliance check after foreground check. ... * commit '7b065464c996b792c1ecdd9d8c93db1bf0538b8d': Move BT settings appliance check after foreground check.	2012-08-01 10:59:34 -07:00
Ravi Nagarajan	74b8a51d97	am dd2bf1d5: am c70f5483: Reset the priority on unbond ... * commit 'dd2bf1d583bf186075b807152b98e3d30179cb2a': Reset the priority on unbond	2012-08-01 00:46:42 -07:00
Swaminatha Balaji	82d3a75f73	am 8f94abd0: am b45e3c8f: Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled ... * commit '8f94abd065ba3498e5b5eb986608c9950c4365ff': Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled	2012-08-01 00:46:41 -07:00
Ganesh Ganapathi Batta	aa9ab830f3	am 8a0103df: am 802956ec: Add dev to cached dev list if entry is missing before auto connect ... * commit '8a0103df4ef5425ca63071ab0b8db4b3cf00dbd2': Add dev to cached dev list if entry is missing before auto connect	2012-08-01 00:46:40 -07:00
Ravi Nagarajan	dd2bf1d583	am c70f5483: Reset the priority on unbond ... * commit 'c70f5483553f5ff2bddc289ea8b7741bc81c9fbf': Reset the priority on unbond	2012-08-01 00:44:12 -07:00
Swaminatha Balaji	8f94abd065	am b45e3c8f: Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled ... * commit 'b45e3c8fe9c08851800a6afa362d975944c0cd46': Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled	2012-08-01 00:44:09 -07:00
Ganesh Ganapathi Batta	8a0103df4e	am 802956ec: Add dev to cached dev list if entry is missing before auto connect ... * commit '802956ec9b22464ed327c0c2cbc59f6b6a309c88': Add dev to cached dev list if entry is missing before auto connect	2012-08-01 00:44:07 -07:00
Ravi Nagarajan	c70f548355	Reset the priority on unbond ... Change-Id: I67b68bd70b947177218e0b908b79ebb9de9f45a8	2012-08-01 00:25:24 -07:00
Swaminatha Balaji	b45e3c8fe9	Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled ... Change-Id: I0716782a5308cc45297a30d0a7371286c75bfa52	2012-08-01 00:23:58 -07:00
Ganesh Ganapathi Batta	802956ec9b	Add dev to cached dev list if entry is missing before auto connect ... Fix for BLTH01482218 Change-Id: I7d5cfad3eff872b5eb0b0c71804f25f3c3334557	2012-08-01 00:23:37 -07:00
Justin Koh	7b065464c9	Move BT settings appliance check after foreground check. ... Move the BT settings appliance check after the foreground activity check. This allows us to pair bt devices if we have a UI hooked up instead of never allowing it. TESTED = runs on Nexus Q. Change-Id: I3c1ea4abb8d05236d91d2525934bec757cc5ca88	2012-07-31 18:32:39 -07:00
The Android Open Source Project	82b6c521af	am c6e71902: (-s ours) Reconcile with jb-mr1-release - do not merge ... * commit 'c6e719022734f3f030327022f757e50f54970baa':	2012-07-31 15:06:04 -07:00
The Android Open Source Project	c6e7190227	Reconcile with jb-mr1-release - do not merge ... Change-Id: Icc9358e5fffbcb4af923a9f66b59b15d6113fade	2012-07-31 15:04:02 -07:00
The Android Open Source Project	996a33fab6	am 721876d1: (-s ours) am dbe1a24d: am f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge ... * commit '721876d13fb40b2c2a568ccdf6f989511991decd':	2012-07-31 14:55:10 -07:00
The Android Open Source Project	721876d13f	am dbe1a24d: am f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge ... * commit 'dbe1a24d3595bff9b911b46f34e12a18e55cab74':	2012-07-31 14:52:52 -07:00
The Android Open Source Project	dbe1a24d35	am f6162c80: (-s ours) Reconcile with jb-mr0-release - do not merge ... * commit 'f6162c80cf048fe710f5cc0502fcfc052ff98385':	2012-07-31 14:51:08 -07:00
The Android Open Source Project	f6162c80cf	Reconcile with jb-mr0-release - do not merge ... Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6	2012-07-31 14:48:53 -07:00
The Android Automerger	2e1cf2aa70	merge in jb-mr0-release history after reset to jb-dev	2012-07-31 14:07:44 -07:00
The Android Automerger	19ee76801b	merge in jb-mr1-release history after reset to jb-mr1-dev	2012-07-31 07:35:31 -07:00
Ying Wang	e352946815	am 0b0a57c2: (-s ours) am e2d5699d: am 9691c1e6: (-s ours) am 723bdf1e: Import translations. DO NOT MERGE ... * commit '0b0a57c2e4c4f14fe21db5ea45e2b78542760c21': Import translations. DO NOT MERGE	2012-07-30 15:33:21 -07:00
Ying Wang	7b140e0df8	am 70095e71: (-s ours) am df61ddc9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev ... * commit '70095e71e4c13cec8851dacafa5fc38f595d5403': Import translations. DO NOT MERGE	2012-07-30 15:30:19 -07:00
The Android Open Source Project	53f36d0d53	am 4d5d5107: (-s ours) Reconcile with jb-mr1-release ... * commit '4d5d510713ba79b044b0d62434e6067b2fb5fd01':	2012-07-30 15:16:42 -07:00
Ying Wang	0b0a57c2e4	am e2d5699d: am 9691c1e6: (-s ours) am 723bdf1e: Import translations. DO NOT MERGE ... * commit 'e2d5699d2592fb03c03c0d74ee414dcff31bbf90': Import translations. DO NOT MERGE	2012-07-30 15:12:24 -07:00
Ying Wang	70095e71e4	am df61ddc9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev ... * commit 'df61ddc964eb626e5952cc3918d9b227fcc6e7b7': Import translations. DO NOT MERGE	2012-07-30 15:10:37 -07:00
The Android Open Source Project	abbcdb75aa	am db7bda5c: am c9976592: am a62d7893: Reconcile with jb-mr0-release jb-release ... * commit 'db7bda5cc74a757c91917e01fe9693adcab16684':	2012-07-30 15:10:22 -07:00
Ying Wang	e2d5699d25	am 9691c1e6: (-s ours) am 723bdf1e: Import translations. DO NOT MERGE ... * commit '9691c1e646b143690476724b1d7f8dc788cfe00f': Import translations. DO NOT MERGE	2012-07-30 15:09:41 -07:00
Ying Wang	9691c1e646	am 723bdf1e: Import translations. DO NOT MERGE ... * commit '723bdf1ec561d211b45f20546e6938e68feebf39': Import translations. DO NOT MERGE	2012-07-30 15:06:58 -07:00
The Android Open Source Project	4d5d510713	Reconcile with jb-mr1-release ... Change-Id: I748fdd61c5644211f2406b42eefa521e4d7ed2d7	2012-07-30 15:05:14 -07:00