OSDN Git Service
Baligh Uddin [Tue, 8 Apr 2014 02:16:43 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 8 Apr 2014 02:16:33 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Alan Viverette [Tue, 8 Apr 2014 01:59:51 +0000 (18:59 -0700)]
Update APIs to fix build
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
Eric Laurent [Tue, 8 Apr 2014 01:23:21 +0000 (01:23 +0000)]
Merge "Revert "Initial implementation of USB Audio output.""
Eric Laurent [Tue, 8 Apr 2014 01:01:29 +0000 (18:01 -0700)]
Revert "Initial implementation of USB Audio output."
This reverts commit
3af0fe0c9df2fc1e0a4d6bcd827a4d7aa28dbdeb
while investigating issues
13751080 and
13883978.
Bug:
13751080.
John Reck [Tue, 8 Apr 2014 00:31:44 +0000 (17:31 -0700)]
Veto pool TODO
Change-Id: I50067dba630b75aa539e4406cfc15f66949684b3
John Reck [Tue, 8 Apr 2014 00:32:15 +0000 (00:32 +0000)]
Merge "Fence on draws that are reported"
John Reck [Mon, 7 Apr 2014 23:59:25 +0000 (16:59 -0700)]
Fence on draws that are reported
Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
Alan Viverette [Mon, 7 Apr 2014 23:55:29 +0000 (23:55 +0000)]
Merge "Color theming for VectorDrawable, general clean up"
Alan Viverette [Mon, 7 Apr 2014 23:50:46 +0000 (16:50 -0700)]
Color theming for VectorDrawable, general clean up
BUG:
13878079
Change-Id: I831d26fe3a2658161fc24e947bce382d0be6b548
George Mount [Mon, 7 Apr 2014 23:28:43 +0000 (23:28 +0000)]
Merge "Allow opaque windows to become translucent."
John Reck [Mon, 7 Apr 2014 22:42:21 +0000 (22:42 +0000)]
Merge "Refcount RenderNode"
Craig Mautner [Mon, 7 Apr 2014 22:27:55 +0000 (22:27 +0000)]
am
8f2adcb1: am
228cefa8: am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
[ActivityManager] Reduce report ANR on wrong activity.
Deepanshu Gupta [Mon, 7 Apr 2014 22:27:01 +0000 (22:27 +0000)]
Merge "Fix theme/style resolution in Layoutlib"
Craig Mautner [Mon, 7 Apr 2014 22:21:33 +0000 (22:21 +0000)]
am
228cefa8: am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
228cefa83dd7b95e5581f619bb597808af726f80':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:14:56 +0000 (22:14 +0000)]
am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
3fb2b7132b64c65163e7c6cd948e45f703e93687':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:10:47 +0000 (22:10 +0000)]
Merge "[ActivityManager] Reduce report ANR on wrong activity."
John Reck [Fri, 4 Apr 2014 23:20:08 +0000 (16:20 -0700)]
Refcount RenderNode
Change-Id: I7a86db8acc2b78ef33d987a43a119f5933d7d752
Adam Hampson [Mon, 7 Apr 2014 21:40:00 +0000 (21:40 +0000)]
am
ec571bd2: (-s ours) am
ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit '
ec571bd203bb543aa1489e0c0a8bb67f5491630e':
DO NOT MERGE Fix several bad function definitions.
Adam Hampson [Mon, 7 Apr 2014 21:33:54 +0000 (21:33 +0000)]
am
ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
* commit '
ce802f4898c5747038584596d9d689ca30c34c4e':
DO NOT MERGE Fix several bad function definitions.
Adam Hampson [Mon, 7 Apr 2014 21:27:53 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev
Robert Greenwalt [Mon, 7 Apr 2014 20:59:05 +0000 (20:59 +0000)]
am
4455c599: (-s ours) am
0468e3c7: am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4455c5999f72daaf6f15c4394e413976f14337d3':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:52:59 +0000 (20:52 +0000)]
am
0468e3c7: am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
0468e3c7fae6945e21314ae2971c51dcb36972ee':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:50:46 +0000 (20:50 +0000)]
am
f00b906f: (-s ours) am
cb163c68: am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
f00b906f01319a8177d2e2ab109ff01016b0bf4c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:46:58 +0000 (20:46 +0000)]
am
e1d4847c: am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:43:55 +0000 (20:43 +0000)]
am
cb163c68: am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
cb163c684d7a364684ef5b1a1937aa2e92856906':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:41:00 +0000 (20:41 +0000)]
am
331fa429: am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
331fa429cad1f464f0375a3466ba528b03c6e90d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:37:38 +0000 (20:37 +0000)]
am
c855a28a: am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:34:49 +0000 (20:34 +0000)]
am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:31:45 +0000 (20:31 +0000)]
am
5f3c0630: am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
5f3c0630e488bbcee687933b6350370a42354dc4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:27:50 +0000 (20:27 +0000)]
am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
463eeb70938403bdca2519d9b71911aab93b9277':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)]
am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
522bd7fb3468bc07133c7ff1a02033dcced740b9':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)]
Merge "Revert action bar theme attribute"
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 20:21:38 +0000 (13:21 -0700)]
Revert action bar theme attribute
BUG:
13878093
Change-Id: I7cc4e270854f66d604a6e22eafbeef37c968fdae
Robert Greenwalt [Mon, 7 Apr 2014 20:18:41 +0000 (20:18 +0000)]
am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
24444abff4ad45b731d4f6cd92afed79568773d8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 19:52:17 +0000 (19:52 +0000)]
Merge "Fix dialog width"
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Alan Viverette [Mon, 7 Apr 2014 19:41:56 +0000 (12:41 -0700)]
Fix dialog width
Also breaks dialog button alignment, but we'll fix that later.
Change-Id: I5def9ff3dc9dfcbce34e514ae546c47e5d3863e1
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
Selim Cinek [Mon, 7 Apr 2014 19:23:39 +0000 (19:23 +0000)]
Merge "QuickSettings was inaccessible sometimes with empty shade."
Selim Cinek [Mon, 7 Apr 2014 19:18:09 +0000 (21:18 +0200)]
QuickSettings was inaccessible sometimes with empty shade.
Fixed access to QuickSettings, when the shade was not full.
Bug:
13879008
Change-Id: Ie8c88b91eb397dcb4d78834acfc2e2ab2a24bed9
Christoph Studer [Mon, 7 Apr 2014 19:15:21 +0000 (19:15 +0000)]
Merge "Write eventlog entries for notification panel visibility"
Christoph Studer [Fri, 21 Mar 2014 12:10:21 +0000 (13:10 +0100)]
Write eventlog entries for notification panel visibility
Change-Id: Ie7e15ed15739cb5f057c900e1cadf90824b2b4ef
Christoph Studer [Mon, 7 Apr 2014 18:50:35 +0000 (18:50 +0000)]
Merge "NoManService: More efficient notification update"
Christoph Studer [Wed, 2 Apr 2014 22:02:39 +0000 (00:02 +0200)]
NoManService: More efficient notification update
Instead of removing the old notification and inserting the
updated notification afterwards, replace the old notification
in-place.
Change-Id: I88962fd2452de191c1d63c142719194282568dcc
riddle_hsu [Mon, 7 Apr 2014 18:44:03 +0000 (02:44 +0800)]
[ActivityManager] Reduce report ANR on wrong activity.
Symptom: ANR report on wrong activity.
Root Cause:
KK changed resume behavior that will not update focus when only resume,
if the activity blocked, it may report ANR on previous focus.
By original concept, it will try to correct the ANR target,
but the stack of waiting(waitingVisible=true) activity may
different with current top stack.
If it gets key dispatch timeout, mResumedActivity and mPausingActivity
of its stack will be null becuase it is not top stack.
Then it is unable to change ANR target to the real no response activity.
Solution:
Use focused stack to get the real culprit.
Reproduce steps:
1.Launch an Activity X from launcher, press home key.
2.Launch X from launcher again, X blocks(sleeps 15sec) in onResume, press back key in the beginning of blocking duration.
3.ANR dialog shows launcher is no response.
Change-Id: I99416ad91e349096f995990f2240a97616fbaf28
Selim Cinek [Mon, 7 Apr 2014 18:07:22 +0000 (20:07 +0200)]
Fixed crash in PanelView dump
Bugreports crashed when dumping PanelView.
Bug:
13872972
Change-Id: I3bd2b5321dd208766248f6506c5592190366e5ea
Alan Viverette [Mon, 7 Apr 2014 17:59:24 +0000 (17:59 +0000)]
Merge "Fix sharing of child bounsd within touch feedback drawable"
Alan Viverette [Mon, 7 Apr 2014 17:58:25 +0000 (10:58 -0700)]
Fix sharing of child bounsd within touch feedback drawable
Change-Id: I13f2f32fb618f07bd967d98d6369399f1d790125
Alan Viverette [Mon, 7 Apr 2014 17:57:44 +0000 (10:57 -0700)]
Quantum ActionBar, cleaning up theme colors
BUG:
13731184
Change-Id: Icca14b094dc1b7f4156306d14a7950b857bbe9c9
Baligh Uddin [Mon, 7 Apr 2014 16:42:48 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00b27f43c6d817ba03464f757af680ab7980ea08
Auto-generated-cl: translation import
Alan Viverette [Mon, 7 Apr 2014 16:31:55 +0000 (16:31 +0000)]
Merge "Don't auto scroll empty lists"
Alan Viverette [Mon, 7 Apr 2014 16:30:13 +0000 (09:30 -0700)]
Don't auto scroll empty lists
BUG:
12930741
Change-Id: I22bcebace0d5e0d519d38b34d6312ffff5b62f9b
George Mount [Mon, 7 Apr 2014 16:17:40 +0000 (16:17 +0000)]
Merge "Add Transitions useful for Activity transitions."
George Mount [Mon, 7 Apr 2014 16:17:32 +0000 (16:17 +0000)]
Merge "Implement "Back" for Activity Transitions."
George Mount [Mon, 10 Mar 2014 23:51:16 +0000 (16:51 -0700)]
Add Transitions useful for Activity transitions.
Slide: transition in and out of the edge of the scene.
Explode: transition to the scene borders
Moved capability from Fade to Visibility.
Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
Baligh Uddin [Mon, 7 Apr 2014 16:09:09 +0000 (09:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5aca3127cc5a9cde5f594d7d12fe0bd2c7a764f4
Auto-generated-cl: translation import
George Mount [Tue, 25 Feb 2014 18:47:55 +0000 (10:47 -0800)]
Implement "Back" for Activity Transitions.
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
Raph Levien [Mon, 7 Apr 2014 15:27:11 +0000 (15:27 +0000)]
Merge "Fix extra text appearing after ellipsis"
Alexandra Gherghina [Mon, 7 Apr 2014 12:26:55 +0000 (12:26 +0000)]
Merge "Introduces intents for adding and removing a managed profile."
Alexandra Gherghina [Fri, 4 Apr 2014 15:27:28 +0000 (16:27 +0100)]
Introduces intents for adding and removing a managed profile.
Change-Id: I6b8b7a314ea52bfd0c750da94066156e73a0f2f5
Kenny Guy [Mon, 7 Apr 2014 10:54:58 +0000 (10:54 +0000)]
Merge "Launch recents with the correct user."
Jaewan Kim [Mon, 7 Apr 2014 09:01:43 +0000 (09:01 +0000)]
Merge "Revert "Refactor IpConfiguration from WifiConfiguration""
Jaewan Kim [Mon, 7 Apr 2014 09:01:24 +0000 (09:01 +0000)]
Revert "Refactor IpConfiguration from WifiConfiguration"
This reverts commit
1284767ceb1affa6d5af77fd26ccf7322df48a6d.
Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
Jaewan Kim [Mon, 7 Apr 2014 08:54:45 +0000 (08:54 +0000)]
Revert "Hide IpConfiguration"
This reverts commit
d07372e2e96ed6d2012db8518e05018c9710cafb.
Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
Jaewan Kim [Mon, 7 Apr 2014 08:10:22 +0000 (17:10 +0900)]
Hide IpConfiguration
Bug:
7606609, Bug:
8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
Jaewan Kim [Mon, 7 Apr 2014 04:40:45 +0000 (04:40 +0000)]
Merge "Refactor IpConfiguration from WifiConfiguration"
Jaewan Kim [Mon, 10 Mar 2014 08:10:51 +0000 (17:10 +0900)]
Refactor IpConfiguration from WifiConfiguration
Bug:
7606609, Bug:
8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
quddusc [Sat, 5 Apr 2014 22:45:01 +0000 (22:45 +0000)]
am
f403d60f: am
17878a9a: am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
f403d60fc8dfe2b833a65b6933a07c44d849e831':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:38:52 +0000 (22:38 +0000)]
am
17878a9a: am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
17878a9ab5c58f5b245bbdd0e8e16abbcde4a995':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:32:35 +0000 (22:32 +0000)]
am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
b430ec756473330f47bda2d8f0c266b3398169c9':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:27:25 +0000 (22:27 +0000)]
am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
7db3875cdca4c94cb667d2d0cc86718f15e3305c':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:23:35 +0000 (22:23 +0000)]
Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
Etienne Le Grand [Sat, 5 Apr 2014 17:05:38 +0000 (17:05 +0000)]
am
acf395fd: am
819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
* commit '
acf395fd9441bce9fbe68c1b7efbf824570284bc':
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
Etienne Le Grand [Sat, 5 Apr 2014 09:05:50 +0000 (09:05 +0000)]
am
819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
* commit '
819239e5bec90ee3c861ac45fffac4a832a183a1':
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
Etienne Le Grand [Sat, 5 Apr 2014 04:47:14 +0000 (04:47 +0000)]
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
This reverts commit
fd53d8352a4617941b0a0449390aa562a01ea1d3.
Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
(cherry picked from commit
819239e5bec90ee3c861ac45fffac4a832a183a1)
Etienne Le Grand [Sat, 5 Apr 2014 04:47:14 +0000 (04:47 +0000)]
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
This reverts commit
fd53d8352a4617941b0a0449390aa562a01ea1d3.
Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
Etienne Le Grand [Sat, 5 Apr 2014 03:53:49 +0000 (03:53 +0000)]
am
bdfe3841: am
fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
* commit '
bdfe384106de364ea2effac6ab80108556d11649':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Etienne Le Grand [Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)]
am
fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
* commit '
fd53d8352a4617941b0a0449390aa562a01ea1d3':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Christopher Tate [Sat, 5 Apr 2014 01:27:09 +0000 (01:27 +0000)]
Merge "Back up the preferred home app, if any"
Deepanshu Gupta [Sat, 5 Apr 2014 01:06:00 +0000 (01:06 +0000)]
Merge "Fix sdk build"
Deepanshu Gupta [Sat, 5 Apr 2014 01:02:57 +0000 (18:02 -0700)]
Fix sdk build
Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
Christopher Tate [Fri, 4 Apr 2014 23:58:10 +0000 (16:58 -0700)]
Back up the preferred home app, if any
If the user has stated a preference about their home app, make sure we
capture that so that a system restore can return them to that preferred
situation. It's built into the system metadata so that we can, if
necessary, fast-path configuration of that home app while the rest of
the restore operation is in flight.
Change-Id: I64dfee8f7a2a9e40f556cd19298d7b367c6aa8dc
Michael Wright [Fri, 4 Apr 2014 23:51:36 +0000 (23:51 +0000)]
Merge "Fix size_t format specifier"
Nick Kralevich [Fri, 4 Apr 2014 23:37:53 +0000 (23:37 +0000)]
am
8e2a4b53: am
4ed27328: am
dc97144b: Merge "Always call super.onCreate(). Always."
* commit '
8e2a4b539509f03c4b3521574a910f2ea3296a66':
Always call super.onCreate(). Always.
OSDN Git Service
