OSDN Git Service
Alan Viverette [Tue, 8 Apr 2014 23:38:22 +0000 (23:38 +0000)]
Merge "Make Drawable hotspot APIs public"
Deepanshu Gupta [Tue, 8 Apr 2014 23:37:33 +0000 (23:37 +0000)]
Merge "Update layoutlib create README"
Alan Viverette [Tue, 8 Apr 2014 23:37:19 +0000 (16:37 -0700)]
Make Drawable hotspot APIs public
Change-Id: I8377ed735f73f7083636947aa08a5427f1dc3bf6
Deepanshu Gupta [Tue, 8 Apr 2014 23:16:43 +0000 (16:16 -0700)]
Update layoutlib create README
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.
Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
Jae Seo [Tue, 8 Apr 2014 23:00:51 +0000 (23:00 +0000)]
Merge "Unhide TvInputSession"
Deepanshu Gupta [Tue, 8 Apr 2014 22:47:44 +0000 (22:47 +0000)]
Merge "Make layoutlib load on Java 7 VM"
Jae Seo [Tue, 8 Apr 2014 22:40:17 +0000 (15:40 -0700)]
Unhide TvInputSession
This is necessary for the SDK build.
Change-Id: I64fb6b7e6cc3147edbfff0c34cd6af7f45a82364
Alan Viverette [Tue, 8 Apr 2014 22:29:37 +0000 (22:29 +0000)]
Merge "Make toggle slider use default assets"
Alan Viverette [Tue, 8 Apr 2014 22:27:24 +0000 (15:27 -0700)]
Make toggle slider use default assets
BUG:
13817697
Change-Id: Ibae671a35b55a195b40d8c943f45685fb7b3ac4f
John Reck [Tue, 8 Apr 2014 22:23:13 +0000 (22:23 +0000)]
Merge "Ensure there's a GL context before creating a Layer"
Christoph Studer [Tue, 8 Apr 2014 21:43:07 +0000 (17:43 -0400)]
Fix memory leak in NotificationStackScrollLayout
Bug:
13899792
Change-Id: I87d6c5e1f0f5052d45203df51284d828823dfd88
John Reck [Tue, 8 Apr 2014 22:18:56 +0000 (15:18 -0700)]
Ensure there's a GL context before creating a Layer
Bug:
13745587
Change-Id: Ib0ec059d9a5974a48734daeec9d83580cada94a3
Alan Viverette [Tue, 8 Apr 2014 22:10:53 +0000 (22:10 +0000)]
Merge "Fix action bar theming"
Deepanshu Gupta [Tue, 8 Apr 2014 22:07:49 +0000 (15:07 -0700)]
Make layoutlib load on Java 7 VM
Prevent Java 7 VM from verifying the StackMapTable for methods by lying
about the class version.
The changeset also fixes the eclipse project by using the right asm
library in the checkout.
Change-Id: Idabf165380fb75fcc2d5c8fbd72388f52887a5df
Amith Yamasani [Tue, 8 Apr 2014 22:04:20 +0000 (22:04 +0000)]
Merge "Launcher APIs and broadcasts for managed profiles"
Alan Viverette [Tue, 8 Apr 2014 21:52:01 +0000 (14:52 -0700)]
Fix action bar theming
Change-Id: If1a7040e4f6d2e8e1195a67a03ed0e24f31e68f4
John Reck [Tue, 8 Apr 2014 21:22:42 +0000 (21:22 +0000)]
Merge "Don't make HardwareRenderer calls in the finalizer"
John Reck [Tue, 8 Apr 2014 21:10:17 +0000 (14:10 -0700)]
Don't make HardwareRenderer calls in the finalizer
Bug:
13902530
Don't try to set the RenderNode's displayListData to 0 in the finalizer.
The HardwareRenderer may have already been finalized and it's not valid
to make calls into HardwareRenderer from another thread anyway.
The fix is that now that RenderNode is a refcounted object, this step
can be skipped entirely. The RenderNode destructor handles deleting
its DisplayListData if it needs to.
Change-Id: Ieab75575b98c24678a531dd5aa41a2d0afde0eef
Alan Viverette [Tue, 8 Apr 2014 20:49:39 +0000 (20:49 +0000)]
Merge "Fix some vector drawable documentation, clean up fields"
Alan Viverette [Tue, 8 Apr 2014 20:35:49 +0000 (13:35 -0700)]
Fix some vector drawable documentation, clean up fields
Change-Id: Iade0323b0ec2d3f8b609f24d89252608dfe40735
Jae Seo [Fri, 21 Feb 2014 02:23:25 +0000 (18:23 -0800)]
Initial round of Television Input Framework
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.
Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
Fabrice Di Meglio [Tue, 8 Apr 2014 02:12:41 +0000 (19:12 -0700)]
Add support for saving and using the Preference's key value
- make public and hide the PreferenceGroupAdapter class
- add setActivated(int position) to be able to set the activated item
- udpate getView(int position, View convertView, ViewGroup parent) to set/unset
the activated item
Change-Id: I8a653ad6541bb6b7a043ba7c3d95e5ecad924a0d
Fabrice Di Meglio [Tue, 8 Apr 2014 20:11:27 +0000 (20:11 +0000)]
Merge "Add support for key value for SearchIndexableData"
Ying Wang [Tue, 8 Apr 2014 19:16:46 +0000 (19:16 +0000)]
Merge "Fix sdk build."
Ying Wang [Tue, 8 Apr 2014 19:14:50 +0000 (12:14 -0700)]
Fix sdk build.
Change-Id: I3e620315e082b46ba5fcd4511b9c258bf610ddf5
Kenny Guy [Tue, 8 Apr 2014 17:59:27 +0000 (17:59 +0000)]
Merge "Pipe notifications from related users to listeners."
Amith Yamasani [Wed, 19 Feb 2014 22:31:52 +0000 (14:31 -0800)]
Launcher APIs and broadcasts for managed profiles
UserManager
- Corp badging
- Querying list of managed profiles
Launcher API
- LauncherApps and Service to proxy changes in managed profile
to the launcher in the primary profile
- Querying and launching launchable apps across profiles
Change-Id: Id8f7b4201afdfb5f414d04156d7b81300119289e
Ying Wang [Fri, 4 Apr 2014 04:42:46 +0000 (21:42 -0700)]
Expose APIs used to be hidden due to Doclava bug.
If a class inherits public fields from a hidden interface, they should
be exposed as APIs. A good example is the dozens of constants
java.util.zip.ZipFile inherits form java.util.zip.ZipConstants.
Bug:
13721174
Change-Id: I83cf13c174edf4422bc8ab2be275a47b214e1fa9
Kenny Guy [Mon, 3 Mar 2014 18:24:03 +0000 (18:24 +0000)]
Pipe notifications from related users to listeners.
For Listeners built against L or greater
Send notifications from related users to listeners.
Return notifications from related users getAllActiveNotifications
Cancel notifications from related users in cancelAllNotifications
Deprecate StatusBarNotification.getUserId() and expose getUser()
as APIs should use UserHandles.
Deprecate cancelNotification that takes package, id and tag
in favour of one that takes key.
Fix bug that notifications from related users didn't
trigger sounds.
Change-Id: I1b1c20c9f305b8f3c4047bc5720d8e99cdedfe70
Adam Hampson [Tue, 8 Apr 2014 17:38:35 +0000 (17:38 +0000)]
am
668b1bf8: resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
* commit '
668b1bf80b0e34e7079f826cd9e7358835a1e9cd':
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
Adam Hampson [Tue, 8 Apr 2014 17:24:47 +0000 (10:24 -0700)]
resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
Adam Hampson [Tue, 8 Apr 2014 15:51:22 +0000 (15:51 +0000)]
Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
Leon Scroggins III [Tue, 8 Apr 2014 14:39:49 +0000 (14:39 +0000)]
Merge "Remove SkFloatToScalar."
Yohei Yukawa [Tue, 8 Apr 2014 05:48:45 +0000 (05:48 +0000)]
Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
John Reck [Tue, 8 Apr 2014 02:50:22 +0000 (02:50 +0000)]
Merge "Enable RT, round 2"
John Reck [Tue, 8 Apr 2014 02:38:59 +0000 (19:38 -0700)]
Enable RT, round 2
Change-Id: I8035f477f67ede9a5cd1b4de4498bc7850c7fbf3
Baligh Uddin [Tue, 8 Apr 2014 02:24:11 +0000 (02:24 +0000)]
am
56868fbc: (-s ours) am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
56868fbcd9b086219c4350ac34b5dfdde127c5b9':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:20:37 +0000 (02:20 +0000)]
am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
Import translations. DO NOT MERGE
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:35 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
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
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
(cherry picked from commit
b3802a8e2360aaa0a88faa625e15c31b56eaf125)
Bug:
13763685
Bug:
13763900
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
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"
Leon Scroggins III [Fri, 4 Apr 2014 21:05:24 +0000 (17:05 -0400)]
Remove SkFloatToScalar.
Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.
BUG:
13694396
Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
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"
OSDN Git Service
