OSDN Git Service

android-x86/frameworks-base.git
8 years agoMove State to a separate file.
Steve McKay [Thu, 24 Sep 2015 00:21:40 +0000 (17:21 -0700)]
Move State to a separate file.

Update remaining local DEBUG definitions to use Shared.DEBUG.

Change-Id: I3ed4d4b184836da161adff14bd3d9ca01b435847

8 years agoMerge "Merge BROWSE and BROWSE_ALL actions."
Steve McKay [Wed, 23 Sep 2015 22:41:49 +0000 (22:41 +0000)]
Merge "Merge BROWSE and BROWSE_ALL actions."

8 years agoMerge "Showing docked stack divider window."
Filip Gruszczynski [Wed, 23 Sep 2015 21:59:15 +0000 (21:59 +0000)]
Merge "Showing docked stack divider window."

8 years agoShowing docked stack divider window.
Filip Gruszczynski [Tue, 22 Sep 2015 00:57:57 +0000 (17:57 -0700)]
Showing docked stack divider window.

When there is docked stack, we want to show a "handle" through which the
user will resize the docked stack. We add it from the system process,
because we want to avoid IPC calls.

Change-Id: If15fd2a0fcb7077446d1ba6c533acb3028a42039

8 years agoMerge "End switch thumb animator if it's been started"
Alan Viverette [Wed, 23 Sep 2015 20:05:35 +0000 (20:05 +0000)]
Merge "End switch thumb animator if it's been started"

8 years agoMerge "Fixing crash in configuration change for secondary users."
Winson Chung [Wed, 23 Sep 2015 20:00:01 +0000 (20:00 +0000)]
Merge "Fixing crash in configuration change for secondary users."

8 years agoam 93d1a17b: am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatc...
Jorim Jaggi [Wed, 23 Sep 2015 19:53:00 +0000 (19:53 +0000)]
am 93d1a17b: am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility

* commit '93d1a17bafd51daaf6ed7fc56c7c3e84c5c119df':
  Do not go over handler to dispatch keyguard visibility

8 years agoam 1c9a9a20: am 8faa9e9e: am 898e6973: am 739bb7c6: Merge "save "retain loader" state...
Todd Kennedy [Wed, 23 Sep 2015 19:52:36 +0000 (19:52 +0000)]
am 1c9a9a20: am 8faa9e9e: am 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev

* commit '1c9a9a20c35464d8a6554a2becff0f8acfb9c5b2':
  save "retain loader" state

8 years agoam 6ae227e2: am a2e47e2f: am d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am...
Paul Jensen [Wed, 23 Sep 2015 19:52:00 +0000 (19:52 +0000)]
am 6ae227e2: am a2e47e2f: am d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '6ae227e27fcab0a454ac45b897843bfceaa09c69':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam f86347f5: am 88674941: am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s...
Paul Jensen [Wed, 23 Sep 2015 19:51:53 +0000 (19:51 +0000)]
am f86347f5: am 88674941: am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit 'f86347f54d0da443172713db0f6fc145ca5b19ff':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 4d1b3fda: (-s ours) am 1584eefe: (-s ours) am eb1e4b14: (-s ours) am 9c5e49b7...
Baligh Uddin [Wed, 23 Sep 2015 19:51:46 +0000 (19:51 +0000)]
am 4d1b3fda: (-s ours) am 1584eefe: (-s ours) am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '4d1b3fda4343e026b2ec80689f5747744cc86692':
  Import translations. DO NOT MERGE

8 years agoam 0882771d: (-s ours) am b89ac616: (-s ours) am 981c592d: (-s ours) am 18daf48f...
Baligh Uddin [Wed, 23 Sep 2015 19:51:39 +0000 (19:51 +0000)]
am 0882771d: (-s ours) am b89ac616: (-s ours) am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '0882771d196468efad1e5350d0ba163c11e20b92':
  Import translations. DO NOT MERGE

8 years agoam ed8ba7f9: (-s ours) am 68aefeeb: (-s ours) am c31d6b70: (-s ours) am d213d288...
Baligh Uddin [Wed, 23 Sep 2015 19:51:32 +0000 (19:51 +0000)]
am ed8ba7f9: (-s ours) am 68aefeeb: (-s ours) am c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'ed8ba7f90b42303deca05d396857aec032a880c8':
  Import translations. DO NOT MERGE

8 years agoam c8d2fa3c: (-s ours) am 43c9b3ee: (-s ours) am a58143b4: (-s ours) am a6928d4d...
Baligh Uddin [Wed, 23 Sep 2015 19:51:24 +0000 (19:51 +0000)]
am c8d2fa3c: (-s ours) am 43c9b3ee: (-s ours) am a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'c8d2fa3c2e8d957cf84ef543a2bcd3d9778cc0e3':
  Import translations. DO NOT MERGE

8 years agoFixing crash in configuration change for secondary users.
Winson [Wed, 23 Sep 2015 19:44:33 +0000 (12:44 -0700)]
Fixing crash in configuration change for secondary users.

- The crash is a regression caused by ag/773159.

8 years agoam 651a1403: (-s ours) am 16bea03a: (-s ours) am 0b97b8cf: (-s ours) am 64f17a52...
Baligh Uddin [Wed, 23 Sep 2015 19:51:14 +0000 (19:51 +0000)]
am 651a1403: (-s ours) am 16bea03a: (-s ours) am 0b97b8cf: (-s ours) am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '651a14033e14b0868eb5b5508d4943396a7761b9':
  Import translations. DO NOT MERGE

8 years agoMerge BROWSE and BROWSE_ALL actions.
Steve McKay [Wed, 16 Sep 2015 22:07:31 +0000 (15:07 -0700)]
Merge BROWSE and BROWSE_ALL actions.

Open Files app when exploring from settings.
Force visibility of file size in this mode.
Don't hide empty media providers.

Bug: 2413661824140864
Change-Id: I6f238586725f9b6255812e3082bb8d8655219a7d

8 years agoam 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard...
Jorim Jaggi [Wed, 23 Sep 2015 19:12:41 +0000 (19:12 +0000)]
am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility

* commit '1af3c6f401da0ab8c4ddefd3e1776f9be50a1389':
  Do not go over handler to dispatch keyguard visibility

8 years agoMerge "Hotspot 2.0 relase 2 first cut."
Jan Nordqvist [Wed, 23 Sep 2015 19:05:53 +0000 (19:05 +0000)]
Merge "Hotspot 2.0 relase 2 first cut."

8 years agoam 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
Jorim Jaggi [Wed, 23 Sep 2015 19:03:26 +0000 (19:03 +0000)]
am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility

* commit '1bcb3472669529edc991a31e6cbf7866a385383e':
  Do not go over handler to dispatch keyguard visibility

8 years agoam 6a15d528: Do not go over handler to dispatch keyguard visibility
Jorim Jaggi [Wed, 23 Sep 2015 18:55:38 +0000 (18:55 +0000)]
am 6a15d528: Do not go over handler to dispatch keyguard visibility

* commit '6a15d528c0a4501389008ef945dec38b5ca6919a':
  Do not go over handler to dispatch keyguard visibility

8 years agoCleanup USER_OWNER in activity and location services
Xiaohui Chen [Tue, 22 Sep 2015 22:29:31 +0000 (15:29 -0700)]
Cleanup USER_OWNER in activity and location services

Bug: 19913735
Change-Id: Ie2b7acb3fa53b1dcf7319de1eb5bdec585dbf78c

8 years agoCleanup OWNER references.
Xiaohui Chen [Tue, 22 Sep 2015 22:33:31 +0000 (15:33 -0700)]
Cleanup OWNER references.

Bug: 19913735
Change-Id: I2150c6baaab80fe11312e4401394a2a8da52e595

8 years agoCleanup USER_OWNER in DPMS
Xiaohui Chen [Tue, 22 Sep 2015 22:08:57 +0000 (15:08 -0700)]
Cleanup USER_OWNER in DPMS

This cl assumes device owner will continue running under user 0.

Bug: 19913735
Change-Id: I65c97f6f14fb362acbdcb6588b73787291100698

8 years agoDo not go over handler to dispatch keyguard visibility
Jorim Jaggi [Tue, 22 Sep 2015 22:55:33 +0000 (15:55 -0700)]
Do not go over handler to dispatch keyguard visibility

When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.

Bug: 24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671

8 years agoam 8faa9e9e: am 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc...
Todd Kennedy [Wed, 23 Sep 2015 18:30:57 +0000 (18:30 +0000)]
am 8faa9e9e: am 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev

* commit '8faa9e9e349011aebab6527476e315f6a5f610e4':
  save "retain loader" state

8 years agoEnd switch thumb animator if it's been started
Alan Viverette [Wed, 23 Sep 2015 18:23:21 +0000 (14:23 -0400)]
End switch thumb animator if it's been started

Running implies that it's been started and the animation has actually
begun, which is not true if we call start() and then immediately try
to jump state.

Bug: 24273164
Change-Id: I7f8d856dbe925679dad082f1e28d8936ac2b04db

8 years agoam 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
Todd Kennedy [Wed, 23 Sep 2015 18:12:03 +0000 (18:12 +0000)]
am 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev

* commit '898e6973ca198f327059d331b4d83b1d183d5fb1':
  save "retain loader" state

8 years agoam 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
Todd Kennedy [Wed, 23 Sep 2015 18:05:58 +0000 (18:05 +0000)]
am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev

* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state

8 years agoMerge "Remove lookup3 gamma code"
Chris Craik [Wed, 23 Sep 2015 17:59:44 +0000 (17:59 +0000)]
Merge "Remove lookup3 gamma code"

8 years agoMerge "save "retain loader" state" into mnc-dr-dev
Todd Kennedy [Wed, 23 Sep 2015 17:56:52 +0000 (17:56 +0000)]
Merge "save "retain loader" state" into mnc-dr-dev

8 years agoam a2e47e2f: am d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am...
Paul Jensen [Wed, 23 Sep 2015 17:53:09 +0000 (17:53 +0000)]
am a2e47e2f: am d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit 'a2e47e2fbc66eebef5cf94405518882158ac2b15':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 88674941: am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d74...
Paul Jensen [Wed, 23 Sep 2015 17:53:03 +0000 (17:53 +0000)]
am 88674941: am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '88674941e1cb506554e23d7f44170c5829094615':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 1584eefe: (-s ours) am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Sep 2015 17:52:58 +0000 (17:52 +0000)]
am 1584eefe: (-s ours) am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '1584eefebd2de1bcce0e589ee6414df4bade07b9':
  Import translations. DO NOT MERGE

8 years agoam b89ac616: (-s ours) am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Sep 2015 17:52:52 +0000 (17:52 +0000)]
am b89ac616: (-s ours) am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'b89ac616a050fa5efd12c9d5e034bd8780d0446e':
  Import translations. DO NOT MERGE

8 years agoam 68aefeeb: (-s ours) am c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Sep 2015 17:52:45 +0000 (17:52 +0000)]
am 68aefeeb: (-s ours) am c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '68aefeeb50f4a72cd046f6ec2d4fdc8e42ed69bd':
  Import translations. DO NOT MERGE

8 years agoam 43c9b3ee: (-s ours) am a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Sep 2015 17:52:40 +0000 (17:52 +0000)]
am 43c9b3ee: (-s ours) am a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '43c9b3eeac59842e8c8accfcfe2ad8934dd1c4c1':
  Import translations. DO NOT MERGE

8 years agoam 16bea03a: (-s ours) am 0b97b8cf: (-s ours) am 64f17a52: (-s ours) Merge "Import...
Baligh Uddin [Wed, 23 Sep 2015 17:52:34 +0000 (17:52 +0000)]
am 16bea03a: (-s ours) am 0b97b8cf: (-s ours) am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '16bea03a44f53b42781933551abc1d68b3f2edd3':
  Import translations. DO NOT MERGE

8 years agoam d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am...
Paul Jensen [Wed, 23 Sep 2015 17:42:53 +0000 (17:42 +0000)]
am d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit 'd737f715d1188abf89891f4c38308fee04ae2e73':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c1...
Paul Jensen [Wed, 23 Sep 2015 17:42:46 +0000 (17:42 +0000)]
am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '6a728e1744749a6b27e22d696b5327909e57d126':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 23 Sep 2015 17:42:40 +0000 (17:42 +0000)]
am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'eb1e4b14c979b36abbd6869ee300ec69936afb55':
  Import translations. DO NOT MERGE

8 years agoam 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 23 Sep 2015 17:42:34 +0000 (17:42 +0000)]
am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '981c592d2a6eaf3e43a8cab274fbcb4c58b99eab':
  Import translations. DO NOT MERGE

8 years agoam c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 23 Sep 2015 17:42:28 +0000 (17:42 +0000)]
am c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'c31d6b705c1dfb1f85f5cdfd54593a88c858a2c5':
  Import translations. DO NOT MERGE

8 years agoam a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 23 Sep 2015 17:42:22 +0000 (17:42 +0000)]
am a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'a58143b41ce92c425dbdc0abd6a6961cf571a083':
  Import translations. DO NOT MERGE

8 years agoam 0b97b8cf: (-s ours) am 64f17a52: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 23 Sep 2015 17:42:16 +0000 (17:42 +0000)]
am 0b97b8cf: (-s ours) am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '0b97b8cf7954d76c5f6d6d21a7808bbcff524b99':
  Import translations. DO NOT MERGE

8 years agoMerge "Add attribute for specifying initial ScaleDrawable level"
Alan Viverette [Wed, 23 Sep 2015 17:39:08 +0000 (17:39 +0000)]
Merge "Add attribute for specifying initial ScaleDrawable level"

8 years agoam 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am...
Paul Jensen [Wed, 23 Sep 2015 17:25:49 +0000 (17:25 +0000)]
am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '4b7b81178482029f7f58d64cea8620574294ce78':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f871...
Paul Jensen [Wed, 23 Sep 2015 17:25:45 +0000 (17:25 +0000)]
am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '83ce299c6a676819351985c379661ae1f98e806c':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:26 +0000 (17:25 +0000)]
am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9c5e49b713db3ddf12d90d8cff9c2e8191a3667d':
  Import translations. DO NOT MERGE

8 years agoam 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:22 +0000 (17:25 +0000)]
am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '18daf48f1af38a75c2fb2a67204fc0852121ade2':
  Import translations. DO NOT MERGE

8 years agoam d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:18 +0000 (17:25 +0000)]
am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'd213d28807c07e7030ae506413fbb0d2c6a9c6b9':
  Import translations. DO NOT MERGE

8 years agoam a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:08 +0000 (17:25 +0000)]
am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'a6928d4d2673f38e4c4110f1d27537044540a7aa':
  Import translations. DO NOT MERGE

8 years agoam 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 17:25:04 +0000 (17:25 +0000)]
am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '64f17a522ab39bec570e96c6bab7442f6026b902':
  Import translations. DO NOT MERGE

8 years agoDon't split the href across lines
Evan Charlton [Wed, 23 Sep 2015 16:37:11 +0000 (09:37 -0700)]
Don't split the href across lines

This introduces untrimmed whitespace into the URL which causes an
infinite redirect loop when trying to load
/Geofence.Builder.%20%20%20%20.html

Bug: 20851763
Change-Id: I3dc670dc30e57f76403d1eeaf3a4ce50406b9d91

8 years agoMerge "Eliminate bad type parameterization."
Steve McKay [Wed, 23 Sep 2015 15:53:52 +0000 (15:53 +0000)]
Merge "Eliminate bad type parameterization."

8 years agoEliminate bad type parameterization.
Steve McKay [Tue, 22 Sep 2015 23:37:03 +0000 (16:37 -0700)]
Eliminate bad type parameterization.

Change-Id: Id886098926f3c62583f34cfbcc04953bb2f4e8c3

8 years agoMerge "Preserve windows during stack resize."
Filip Gruszczynski [Wed, 23 Sep 2015 15:32:29 +0000 (15:32 +0000)]
Merge "Preserve windows during stack resize."

8 years agoMerge "Always show full strength for wifi quick toggle"
Jason Monk [Wed, 23 Sep 2015 15:21:32 +0000 (15:21 +0000)]
Merge "Always show full strength for wifi quick toggle"

8 years agoAlways show full strength for wifi quick toggle
Jason Monk [Wed, 23 Sep 2015 15:11:00 +0000 (11:11 -0400)]
Always show full strength for wifi quick toggle

Don't show status like connection strength and activity for the
wifi quick toggle.

Change-Id: Ifb104627c516d054862b432b6c6d6d4e114b4ade

8 years agoam 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge...
Paul Jensen [Wed, 23 Sep 2015 14:50:45 +0000 (14:50 +0000)]
am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '9971167fbe7f3b356ba7fd89d91271376a56d235':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e9834...
Paul Jensen [Wed, 23 Sep 2015 14:50:40 +0000 (14:50 +0000)]
am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '62bb18976f3a79405897bf44bdec8f0abd855b9f':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark...
Paul Jensen [Wed, 23 Sep 2015 14:42:02 +0000 (14:42 +0000)]
am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '5ebe8e26f2c9517ce321a0fbcbed6efe2960da47':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge...
Paul Jensen [Wed, 23 Sep 2015 14:41:57 +0000 (14:41 +0000)]
am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '554cecea4c5e39c25efb721258366ce12e6b861c':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoAdd attribute for specifying initial ScaleDrawable level
Alan Viverette [Wed, 23 Sep 2015 14:20:59 +0000 (10:20 -0400)]
Add attribute for specifying initial ScaleDrawable level

Bug: 19182305
Change-Id: Ic1f183db6183017352babc6dc190fdb9124c285a

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:57 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:31 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:25 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:25 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:06 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoMerge "Smooth progress bar animations"
Alan Viverette [Wed, 23 Sep 2015 14:07:11 +0000 (14:07 +0000)]
Merge "Smooth progress bar animations"

8 years agoSmooth progress bar animations
Alan Viverette [Wed, 23 Sep 2015 14:01:45 +0000 (10:01 -0400)]
Smooth progress bar animations

Removes smooth progress bar hack from volume dialog.

Bug: 23566299
Change-Id: Iafa32538b4f92705c4c1ca2a02145c078add2532

8 years agoMerge "Revert "Add more methods that take a userId to PackageManager.""
Nicolas Prévot [Wed, 23 Sep 2015 11:35:50 +0000 (11:35 +0000)]
Merge "Revert "Add more methods that take a userId to PackageManager.""

8 years agoRevert "Add more methods that take a userId to PackageManager."
Nicolas Prévot [Wed, 23 Sep 2015 11:34:38 +0000 (11:34 +0000)]
Revert "Add more methods that take a userId to PackageManager."

This reverts commit 3b0fc3cf24e1fecdbc11808483c2109415ebfdd2.

It breaks the build. I had missed other places that extend PackageManager.

Change-Id: Iff012ed4ec8d2d32821586eca85fce55ae67f5b5

8 years agoam 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequest...
Paul Jensen [Wed, 23 Sep 2015 11:33:18 +0000 (11:33 +0000)]
am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network...
Paul Jensen [Wed, 23 Sep 2015 11:33:13 +0000 (11:33 +0000)]
am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted...
Paul Jensen [Wed, 23 Sep 2015 11:21:27 +0000 (11:21 +0000)]
am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '773d71e7c45d12810267bb24735360da6e5b258d':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability...
Paul Jensen [Wed, 23 Sep 2015 11:21:22 +0000 (11:21 +0000)]
am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they...
Paul Jensen [Wed, 23 Sep 2015 11:13:48 +0000 (11:13 +0000)]
am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce...
Paul Jensen [Wed, 23 Sep 2015 11:13:40 +0000 (11:13 +0000)]
am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have...
Paul Jensen [Wed, 23 Sep 2015 11:06:32 +0000 (11:06 +0000)]
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 11:06:27 +0000 (11:06 +0000)]
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoMerge "Don't mark NetworkRequests restricted when they don't have restricted caps...
Paul Jensen [Wed, 23 Sep 2015 10:59:31 +0000 (10:59 +0000)]
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev

8 years agoMerge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 10:58:57 +0000 (10:58 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

8 years agoMerge "Add more methods that take a userId to PackageManager."
Nicolas Prévot [Wed, 23 Sep 2015 09:49:29 +0000 (09:49 +0000)]
Merge "Add more methods that take a userId to PackageManager."

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:54:57 +0000 (01:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:44:04 +0000 (01:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:31:31 +0000 (01:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7c5c75590f30ee06cd8171bffb04da5073c394dc
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 08:23:51 +0000 (01:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia019f181e358d2925493075488bea307f7131215
Auto-generated-cl: translation import

8 years agoam b869cbe7: am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsi...
Justin Harrison [Wed, 23 Sep 2015 06:32:55 +0000 (06:32 +0000)]
am b869cbe7: am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit 'b869cbe75a00eac69e31434813d3d33dc16988e9':
  Extended the maximum pulsing duration when dozing

8 years agoam e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration...
Justin Harrison [Wed, 23 Sep 2015 06:25:34 +0000 (06:25 +0000)]
am e2153b97: am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit 'e2153b9741c7d9c3910c9355ae3bf6ec4f5c231b':
  Extended the maximum pulsing duration when dozing

8 years agoam 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing...
Justin Harrison [Wed, 23 Sep 2015 06:18:04 +0000 (06:18 +0000)]
am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit '184440cea399d2332b5dc138a9e8a47e9cde3398':
  Extended the maximum pulsing duration when dozing

8 years agoam 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
Justin Harrison [Wed, 23 Sep 2015 06:07:47 +0000 (06:07 +0000)]
am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit '47cae24077015c5226f5b2d00ebe841ccbaed2d6':
  Extended the maximum pulsing duration when dozing

8 years agoMerge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev
Justin Harrison [Wed, 23 Sep 2015 06:00:24 +0000 (06:00 +0000)]
Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

8 years agoam 80743d2b: am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when...
Michael Lentine [Wed, 23 Sep 2015 05:48:04 +0000 (05:48 +0000)]
am 80743d2b: am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '80743d2ba46f862d8ad910aed54452fae3759fc8':
  Dismiss color fade when it is no longer used.

8 years agoam 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer...
Michael Lentine [Wed, 23 Sep 2015 05:41:35 +0000 (05:41 +0000)]
am 0f3d0612: am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '0f3d0612b649731a084a791a6cc6fa1b74fcd1a1':
  Dismiss color fade when it is no longer used.

8 years agoam 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into...
Michael Lentine [Wed, 23 Sep 2015 05:33:05 +0000 (05:33 +0000)]
am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '0d93002af027044070a554d553ab524564404b18':
  Dismiss color fade when it is no longer used.

8 years agoam 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Michael Lentine [Wed, 23 Sep 2015 05:25:58 +0000 (05:25 +0000)]
am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '17a764431a71ff91cbd9272d592fdcd15a9c7539':
  Dismiss color fade when it is no longer used.

8 years agoMerge "Dismiss color fade when it is no longer used." into mnc-dr-dev
Michael Lentine [Wed, 23 Sep 2015 05:19:19 +0000 (05:19 +0000)]
Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 04:42:46 +0000 (21:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f
Auto-generated-cl: translation import

8 years agoam cc456c7f: am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of...
Soonil Nagarkar [Wed, 23 Sep 2015 02:21:59 +0000 (02:21 +0000)]
am cc456c7f: am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

* commit 'cc456c7fda260808c138caf4015697d42f497d2c':
  Fix reintroduction of b/10845061