OSDN Git Service
Andrei Stingaceanu [Wed, 29 Apr 2015 16:47:25 +0000 (16:47 +0000)]
am
78a4348a: am
eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
* commit '
78a4348a535e530ae77c0e7777247d495596be7c':
DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
Andrei Stingaceanu [Wed, 29 Apr 2015 16:35:23 +0000 (16:35 +0000)]
am
eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
* commit '
eea5a9e0de5825bf3629ad52a51a0dcf5f064fe5':
DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
Andrei Stingaceanu [Wed, 29 Apr 2015 16:21:14 +0000 (16:21 +0000)]
Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
Narayan Kamath [Wed, 29 Apr 2015 15:32:23 +0000 (16:32 +0100)]
Add a libbase static depedency for aapt2.
Required by libziparchive.
(cherry picked from commit
231e054dfd9dfc2e51ecd41dca5e8d93ae648954)
Change-Id: Ifa33c9e44ebd583cf58b8a1239061c613fde92bc
Xiyuan Xia [Wed, 29 Apr 2015 16:13:28 +0000 (16:13 +0000)]
am
ad3fcc02: am
19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev
* commit '
ad3fcc02719ee0edcf413a54271beb237ec17d13':
Update bottom area alpha when stack height changes
Xiyuan Xia [Wed, 29 Apr 2015 15:59:59 +0000 (15:59 +0000)]
am
19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev
* commit '
19be9d31c834f7703a4584eba84bbf4d22027a93':
Update bottom area alpha when stack height changes
Xiyuan Xia [Wed, 29 Apr 2015 15:46:23 +0000 (15:46 +0000)]
Merge "Update bottom area alpha when stack height changes" into mnc-dev
John Reck [Wed, 29 Apr 2015 15:11:33 +0000 (15:11 +0000)]
am
6c921033: am
b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev
* commit '
6c9210332c259570259cd1a92c4ae95f9c298f32':
Remove View:hasStaticLayer()
John Reck [Wed, 29 Apr 2015 14:59:23 +0000 (14:59 +0000)]
am
b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev
* commit '
b77a7551121561f4ea7d5ce0c4030aeb7ce709e8':
Remove View:hasStaticLayer()
John Reck [Wed, 29 Apr 2015 14:48:27 +0000 (14:48 +0000)]
Merge "Remove View:hasStaticLayer()" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:46:24 +0000 (14:46 +0000)]
am
6b960a9e: (-s ours) am
e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
6b960a9e04f25a5827fcc0e675b2de582f8aff84':
Import translations. DO NOT MERGE
Narayan Kamath [Wed, 29 Apr 2015 14:38:15 +0000 (14:38 +0000)]
am
815d9bb1: Merge "Add a static dependency on libbase."
* commit '
815d9bb178a0488ed1579cd230d447630ad0891b':
Add a static dependency on libbase.
Geoff Mendal [Wed, 29 Apr 2015 14:29:19 +0000 (14:29 +0000)]
am
e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e1b43ee91898b4c24a45cbdaa62b572068f998cf':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Apr 2015 14:27:24 +0000 (14:27 +0000)]
am
eb3d1a1b: (-s ours) am
62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
eb3d1a1bd7c6c51c8b2701768f27121a17a20b36':
Import translations. DO NOT MERGE
John Spurlock [Wed, 29 Apr 2015 14:27:19 +0000 (14:27 +0000)]
am
2d67b288: am
8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
* commit '
2d67b2887c0a279aa182646f0e23b176783a1aca':
Volume: Simple dialog footer, DND in quick settings.
Geoff Mendal [Wed, 29 Apr 2015 14:18:40 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:18:14 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icf8a8e3bc6d5a88293a6954c35e766ac8c494a4d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Apr 2015 14:11:39 +0000 (14:11 +0000)]
am
62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
62cb506f27374aecb414d8fa3f064c194d3c69ec':
Import translations. DO NOT MERGE
John Spurlock [Wed, 29 Apr 2015 14:11:35 +0000 (14:11 +0000)]
am
8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
* commit '
8dbcda1b33ad9cd1c19052a332404cc221da42ee':
Volume: Simple dialog footer, DND in quick settings.
Narayan Kamath [Wed, 29 Apr 2015 14:09:03 +0000 (14:09 +0000)]
Merge "Add a static dependency on libbase."
Geoff Mendal [Wed, 29 Apr 2015 14:08:23 +0000 (14:08 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Narayan Kamath [Tue, 28 Apr 2015 08:23:26 +0000 (09:23 +0100)]
Add a static dependency on libbase.
Used by libziparchive.
Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
Geoff Mendal [Wed, 29 Apr 2015 14:03:31 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied1d50de849ab195e9f3c9e70c0f8e8dbf9104fe
Auto-generated-cl: translation import
John Spurlock [Wed, 29 Apr 2015 14:02:49 +0000 (14:02 +0000)]
Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
John Spurlock [Tue, 28 Apr 2015 15:19:13 +0000 (11:19 -0400)]
Volume: Simple dialog footer, DND in quick settings.
- Show DND tile by default, this is now the only
place to manage DND modes / end conditions.
- Remove super footer from volume dialog, replace with
a simplified version that displays the current mode
and allows ending DND.
- Remove obsolete text-only footer from codebase.
- Migrate remaining volume items into main resource files.
- Rename "No interruptions" to "Total silence".
- Add new user information banner for "Total silence"
- Crude media filtering for Total Silence.
(deeper muting changes will be done as a followup)
- Disable volume dialog sliders completely if muted due
to zen.
- Cleanup ZenModePanel: assume embedded mode, remove
expandable subhead
- Remember "favorite" DND mode inside the DND config panel.
- AudioService: consult ringer-mode-delegate before voluming
down into silent.
- Add new hour options to time-based exit conditions.
- Volume dialog visual updates to move closer to final visuals.
- Unify ringer=silent with DND.
Bug:
19260237
Change-Id: I05d7e001eca3b5125418ec3bc4087d0cb8866717
Nicolas Prevot [Wed, 29 Apr 2015 13:50:04 +0000 (13:50 +0000)]
am
4c4471e2: am
1c4a44e5: Do not return cross-profile intent results to a non-enabled user.
* commit '
4c4471e230b0e654a1cfd1468e73b9f58e050b9e':
Do not return cross-profile intent results to a non-enabled user.
Nicolas Prevot [Wed, 29 Apr 2015 13:35:01 +0000 (13:35 +0000)]
am
1c4a44e5: Do not return cross-profile intent results to a non-enabled user.
* commit '
1c4a44e577c7b8316172d1bf5357d006776ae75e':
Do not return cross-profile intent results to a non-enabled user.
Nicolas Prevot [Thu, 23 Apr 2015 16:11:47 +0000 (17:11 +0100)]
Do not return cross-profile intent results to a non-enabled user.
In PackageManagerService.queryIntentActivities, do not return
ResolveInfos targeting a user which is not enabled.
BUG:
19578138
Change-Id: Id4e730ca8671c26f8cf077bc9c66b3dbd37be482
Benjamin Franz [Wed, 29 Apr 2015 09:35:38 +0000 (09:35 +0000)]
am
af275e15: am
c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev
* commit '
af275e157abb8b3add62e5bf1827519820cdf238':
Add status bar flag to disable quick settings
Benjamin Franz [Wed, 29 Apr 2015 09:15:20 +0000 (09:15 +0000)]
am
c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev
* commit '
c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b':
Add status bar flag to disable quick settings
Benjamin Franz [Wed, 29 Apr 2015 08:35:57 +0000 (08:35 +0000)]
Merge "Add status bar flag to disable quick settings" into mnc-dev
Dongwon Kang [Wed, 29 Apr 2015 05:52:39 +0000 (05:52 +0000)]
am
633a45a0: am
25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
* commit '
633a45a0d4e095ae81fc2c3e882c23a6513bbaee':
TIF: throw an exception if an operation takes too long.
Jeff Sharkey [Wed, 29 Apr 2015 05:52:35 +0000 (05:52 +0000)]
am
15c7f90c: am
b42d6946: Method to wipe all adoptable disks.
* commit '
15c7f90c8d84ce992659d0ec29bb0e60f1b603d1':
Method to wipe all adoptable disks.
Dongwon Kang [Wed, 29 Apr 2015 05:41:35 +0000 (05:41 +0000)]
am
25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
* commit '
25466e0a8f3e0f7f1e758642519f3aa8643f6f26':
TIF: throw an exception if an operation takes too long.
Jeff Sharkey [Wed, 29 Apr 2015 05:41:33 +0000 (05:41 +0000)]
am
aa4e35eb: am
b36586a7: Split some VolumeInfo state into VolumeRecord.
* commit '
aa4e35eb6540806958cb37c5c564c5d20dd7a978':
Split some VolumeInfo state into VolumeRecord.
Jeff Sharkey [Wed, 29 Apr 2015 05:41:30 +0000 (05:41 +0000)]
am
b42d6946: Method to wipe all adoptable disks.
* commit '
b42d694691e73d094df616fe78627ada7e1239ef':
Method to wipe all adoptable disks.
Dongwon Kang [Wed, 29 Apr 2015 05:34:24 +0000 (05:34 +0000)]
Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
Dongwon Kang [Mon, 27 Apr 2015 08:43:52 +0000 (17:43 +0900)]
TIF: throw an exception if an operation takes too long.
Bug:
19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136
Jeff Sharkey [Wed, 29 Apr 2015 05:29:50 +0000 (05:29 +0000)]
am
b36586a7: Split some VolumeInfo state into VolumeRecord.
* commit '
b36586a7c9b7718f33961406537e27bbd9b16211':
Split some VolumeInfo state into VolumeRecord.
Jeff Sharkey [Wed, 29 Apr 2015 05:25:26 +0000 (22:25 -0700)]
Method to wipe all adoptable disks.
Will be used by various classes doing factory reset.
Bug:
9433509
Change-Id: I0701abe00abc2fb9085ce1ffe6e28fb27c91ab51
Jeff Sharkey [Mon, 27 Apr 2015 15:42:28 +0000 (08:42 -0700)]
Split some VolumeInfo state into VolumeRecord.
VolumeRecord is a historical record of a volume that we've seen in
the past. It's now surfaced outside the framework for SystemUI to
drive the notifications that bug users to reinsert missing private
volumes.
Show progress notifications for both storage and package movement
operations. Notify when an empty disk is inserted (no usable volumes)
which launches into the normal format flow.
Add API to forget volumes.
Bug:
20275424,
20275424
Change-Id: I75602c17fdcd4d1f1f62324e1a08c4a33093eefa
Shawn Willden [Wed, 29 Apr 2015 04:54:33 +0000 (04:54 +0000)]
am
adbbba9f: Merge "Add missing error codes from keymaster_defs.h."
* commit '
adbbba9f1dc364e4d3911562fdb8f2e666922e2f':
Add missing error codes from keymaster_defs.h.
Alan Viverette [Wed, 29 Apr 2015 04:54:28 +0000 (04:54 +0000)]
am
2ddfcc4a: Merge "Context leaks in EditText causes out of memory"
* commit '
2ddfcc4ade5d6db69808a340ae54280872559ec1':
Context leaks in EditText causes out of memory
David Friedman [Wed, 29 Apr 2015 04:33:11 +0000 (04:33 +0000)]
am
c69018da: am
30565ed2: am
a39e4d37: am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
c69018daff3563d5016010ca17820e5e774c3b86':
Shawn Willden [Wed, 29 Apr 2015 04:30:17 +0000 (04:30 +0000)]
Merge "Add missing error codes from keymaster_defs.h."
David Friedman [Wed, 29 Apr 2015 04:20:41 +0000 (04:20 +0000)]
am
30565ed2: am
a39e4d37: am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
30565ed225e6d91c37b438a64f715725b1663058':
Alan Viverette [Wed, 29 Apr 2015 04:19:38 +0000 (04:19 +0000)]
Merge "Context leaks in EditText causes out of memory"
David Friedman [Wed, 29 Apr 2015 04:18:15 +0000 (04:18 +0000)]
am
1775e0b2: am
16bf47e8: am
3d983dea: am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
1775e0b295b463996c4617210b9bfdfc4833c12b':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 04:08:29 +0000 (04:08 +0000)]
am
16bf47e8: am
3d983dea: am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
16bf47e8d6c9b9b4a9618fef998d6c9808cb17cb':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 04:05:47 +0000 (04:05 +0000)]
am
a39e4d37: am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
a39e4d3716a10e84acbfc0813745ee4303f1edb2':
David Friedman [Wed, 29 Apr 2015 03:51:39 +0000 (03:51 +0000)]
am
3d983dea: am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
3d983deace20df9437bc9efebc67550f3904eee3':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:48:52 +0000 (03:48 +0000)]
am
77ad81b5: am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
77ad81b5301bfbf1691bdad203dd70ce68ce40b3':
David Friedman [Wed, 29 Apr 2015 03:25:38 +0000 (03:25 +0000)]
am
ff1bfac6: am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
ff1bfac68b977f577d537172d87daa5c816be3b7':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:25:15 +0000 (03:25 +0000)]
am
21a9fa47: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
21a9fa471bcc57196a19e40ca29dbaa97233244c':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:13:59 +0000 (03:13 +0000)]
am
c637af9e: am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
c637af9eee48334e6d8d65428734c8928e9bac55':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:01:57 +0000 (03:01 +0000)]
am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 03:01:10 +0000 (03:01 +0000)]
am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 02:49:23 +0000 (02:49 +0000)]
Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
Alex Klyubin [Wed, 29 Apr 2015 02:01:16 +0000 (02:01 +0000)]
am
ecde0330: am
0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
* commit '
ecde03306541259d786aeac9a658f440a2e1b098':
Align AndroidKeyStore API with user auth API.
Jeff Brown [Wed, 29 Apr 2015 02:01:11 +0000 (02:01 +0000)]
am
d5a9ff0e: am
b957a742: Merge changes from topic \'brightness\' into mnc-dev
* commit '
d5a9ff0e7bec6d1e4b93fc8475ca18f5ec0256e1':
Add code to collect data about auto-brightness adjustments.
Add float support to binary event log.
Fabrice Di Meglio [Wed, 29 Apr 2015 02:01:06 +0000 (02:01 +0000)]
am
c55ab042: am
46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev
* commit '
c55ab0422e4232a0c6bfc3fe5c01dc7d995fcd99':
Use Default Browser App for IntentResolution when needed
Christopher Tate [Wed, 29 Apr 2015 02:01:02 +0000 (02:01 +0000)]
am
a01fade4: am
d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it anyway" into mnc-dev
* commit '
a01fade4c9d34f9575c4c8023fc9610ab8bac9c7':
Don't ostensibly back off fstrim but then do it anyway
Amith Yamasani [Wed, 29 Apr 2015 02:00:50 +0000 (02:00 +0000)]
am
b3c7ad32: am
7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev
* commit '
b3c7ad328d0a9467ed3864a84ed822720e970334':
Permissions control via profile/device owner admin
Simranjit Singh Kohli [Wed, 29 Apr 2015 02:00:45 +0000 (02:00 +0000)]
am
7374dc35: am
1f1b88b2: Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev
* commit '
7374dc3547128ed6330c9fbd99fc84e56ce97513':
AccountsDb Logging]: Introducing logging in accountsDb.
Mathieu Chartier [Wed, 29 Apr 2015 02:00:40 +0000 (02:00 +0000)]
am
1e66f25a: am
325a5721: Merge "Properly describe exception" into mnc-dev
* commit '
1e66f25a167a0300152c953271df8aabeecdfcf2':
Properly describe exception
Alan Viverette [Wed, 29 Apr 2015 02:00:31 +0000 (02:00 +0000)]
am
837bf24e: am
e861c8eb: Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev
* commit '
837bf24ee4c44d344f6fc5959c758bf3c287e8b3':
Fix DatePicker max date, disabled day color, and arrow visibility
Wale Ogunwale [Wed, 29 Apr 2015 02:00:25 +0000 (02:00 +0000)]
am
49937b5c: am
b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev
* commit '
49937b5c464582a44d119c07f3b71412dbb2051e':
@hide resizeableActivity attribute and remove from public api
Jorim Jaggi [Wed, 29 Apr 2015 02:00:19 +0000 (02:00 +0000)]
am
15ec725c: am
b3a020a6: Merge "Fix build." into mnc-dev
* commit '
15ec725ce2a4811f8e5948d56609793dc3dfcf17':
Fix build.
Selim Cinek [Wed, 29 Apr 2015 02:00:14 +0000 (02:00 +0000)]
am
3a9c049d: am
61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev
* commit '
3a9c049d03b250cf309895179821604a443a961a':
Follow up CL for heads up notification refactoring
Yorke Lee [Wed, 29 Apr 2015 02:00:08 +0000 (02:00 +0000)]
am
f77899f9: am
f7143ce6: Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev
* commit '
f77899f90b5a6498eda6bdc482c5c0f1ba00fc21':
Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public
Christopher Tate [Wed, 29 Apr 2015 02:00:03 +0000 (02:00 +0000)]
am
25e17ef6: am
de8c7526: Merge "Give scheduled jobs a more substantial timeslice" into mnc-dev
* commit '
25e17ef6d7f56d0f157b799bfc2ad0315b413286':
Give scheduled jobs a more substantial timeslice
Jorim Jaggi [Wed, 29 Apr 2015 01:59:56 +0000 (01:59 +0000)]
am
463444fb: am
420f2688: Merge "Only listen for fingerprint if needed." into mnc-dev
* commit '
463444fb231ed724ec915ce9f99de5ef94c53e05':
Only listen for fingerprint if needed.
Jorim Jaggi [Wed, 29 Apr 2015 01:59:51 +0000 (01:59 +0000)]
am
de2aef5a: am
9a1df486: Merge "Add animation for fingerprint error state" into mnc-dev
* commit '
de2aef5a4e9735fadfe96f587706c526c07cc578':
Add animation for fingerprint error state
Adam Powell [Wed, 29 Apr 2015 01:59:44 +0000 (01:59 +0000)]
am
78cc38d5: am
4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev
* commit '
78cc38d5011df42eb8d15eef81a6bef63c5f2eaa':
Fix a bug when constructing a ChooserTargetAdapter without custom targets
Adrian Roos [Wed, 29 Apr 2015 01:59:32 +0000 (01:59 +0000)]
am
dffb90fe: am
ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev
* commit '
dffb90fe1baa19c5de6156048420e8988b901949':
Rename windowLightStatusBar
dcashman [Wed, 29 Apr 2015 01:59:26 +0000 (01:59 +0000)]
am
2b13a25e: am
fd4e5664: Merge "Fix PackageManagerSettingsTests and add KeySet info." into mnc-dev
* commit '
2b13a25e4f5767c2aad8e4fd16c5679aae2488e6':
Fix PackageManagerSettingsTests and add KeySet info.
Adrian Roos [Wed, 29 Apr 2015 01:59:18 +0000 (01:59 +0000)]
am
5fb269e4: am
59a1e117: Merge changes from topic \'roosa-lpu\' into mnc-dev
* commit '
5fb269e4582d97a541eccf39c2484d8d2a8e16ab':
Remove LockPatternUtils.getCurrentUser()
Require explicit userId in LockPatternUtils
Chris Craik [Wed, 29 Apr 2015 01:59:11 +0000 (01:59 +0000)]
am
4f66e48d: am
2f1d09c3: Merge "Use default constructor to get anti-aliasing" into mnc-dev
* commit '
4f66e48de3a66ca41916b897f0898f8eb23aa2ac':
Use default constructor to get anti-aliasing
Chris Craik [Wed, 29 Apr 2015 01:59:03 +0000 (01:59 +0000)]
am
0e7d1432: am
ff623a5a: Merge "Remove unused flags and dirty rects" into mnc-dev
* commit '
0e7d1432d4ef5662c4aa7e89adf3f43a8761f4bd':
Remove unused flags and dirty rects
Tony Mantler [Wed, 29 Apr 2015 01:58:55 +0000 (01:58 +0000)]
am
cae5bb3b: am
aadac158: Merge "Make sure Transition constructor is accessible before invoking" into mnc-dev
* commit '
cae5bb3b14b569ae51cc719f4f13396e3a475710':
Make sure Transition constructor is accessible before invoking
Luan Nguyen [Wed, 29 Apr 2015 01:58:49 +0000 (01:58 +0000)]
am
2787cab7: am
50ea9422: am
4e7500e1: am
c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
* commit '
2787cab72b5a4a90a4f443311f08994e2eadbdac':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
Joshua Schwarz [Wed, 29 Apr 2015 01:58:43 +0000 (01:58 +0000)]
am
1b8a571c: am
6bb65f0d: am
a4edc82e: am
4547dac0: Fix one-off error in reporting.
* commit '
1b8a571c86e914ac85aa70a644664d855354ced7':
Fix one-off error in reporting.
Craig Mautner [Wed, 29 Apr 2015 01:58:33 +0000 (01:58 +0000)]
am
13302363: am
6b3e0587: Merge "Notify client of all window movements." into mnc-dev
* commit '
13302363d5831288063b98b1cc3c6b077faf32f0':
Notify client of all window movements.
Eino-Ville Talvala [Wed, 29 Apr 2015 01:58:28 +0000 (01:58 +0000)]
am
c2b0203a: am
fa1c1f97: Merge "Camera2: Fix auto-gen documentation crossreferences." into mnc-dev
* commit '
c2b0203a852b9761594235741d27fe9d7046df40':
Camera2: Fix auto-gen documentation crossreferences.
Alan Viverette [Wed, 29 Apr 2015 01:58:22 +0000 (01:58 +0000)]
am
b328bfb1: am
4703273e: Merge "Layout layers without intrinsic dimensions using FILL gravity" into mnc-dev
* commit '
b328bfb1bb932fb774b3e4c07caa538fc4b1f5da':
Layout layers without intrinsic dimensions using FILL gravity
Mike Lockwood [Wed, 29 Apr 2015 01:58:14 +0000 (01:58 +0000)]
am
1ac9018a: am
986da92b: Merge "MidiFramer: Add support for SysEx messages" into mnc-dev
* commit '
1ac9018ac362adcc526311d4473471105c23ef62':
MidiFramer: Add support for SysEx messages
Yorke Lee [Wed, 29 Apr 2015 01:58:08 +0000 (01:58 +0000)]
am
e56d3cb2: am
b7018ba6: Merge "Simplify DefaultDialerManager" into mnc-dev
* commit '
e56d3cb2b02625b4b7568064023252a182e96086':
Simplify DefaultDialerManager
Paul McLean [Wed, 29 Apr 2015 01:58:02 +0000 (01:58 +0000)]
am
62b86779: am
c8240411: Merge "AudioRecord device select continued" into mnc-dev
* commit '
62b8677933fe44cc00bef222139eb22ce466bd90':
AudioRecord device select continued
Alex Klyubin [Wed, 29 Apr 2015 01:45:24 +0000 (01:45 +0000)]
am
0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
* commit '
0838084a3c92d2c64b7eeec6b8a41156977dab59':
Align AndroidKeyStore API with user auth API.
Jeff Brown [Wed, 29 Apr 2015 01:45:20 +0000 (01:45 +0000)]
am
b957a742: Merge changes from topic \'brightness\' into mnc-dev
* commit '
b957a742b29fa6c7a2eda7d60cf61e8af4668ef8':
Add code to collect data about auto-brightness adjustments.
Add float support to binary event log.
Fabrice Di Meglio [Wed, 29 Apr 2015 01:45:04 +0000 (01:45 +0000)]
am
46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev
* commit '
46fc110104f3017f23abb397ca817db2be39f1a2':
Use Default Browser App for IntentResolution when needed
Christopher Tate [Wed, 29 Apr 2015 01:44:56 +0000 (01:44 +0000)]
am
d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it anyway" into mnc-dev
* commit '
d6db7eacc983e22eb88fc7b465f290670127569a':
Don't ostensibly back off fstrim but then do it anyway
Amith Yamasani [Wed, 29 Apr 2015 01:44:50 +0000 (01:44 +0000)]
am
7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev
* commit '
7c97a3ddea62a3bd8a95ca51e7b172b209388815':
Permissions control via profile/device owner admin
Simranjit Singh Kohli [Wed, 29 Apr 2015 01:44:45 +0000 (01:44 +0000)]
am
1f1b88b2: Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev
* commit '
1f1b88b22bf2d22a1074785132a976bb83a4a1d8':
AccountsDb Logging]: Introducing logging in accountsDb.
Mathieu Chartier [Wed, 29 Apr 2015 01:44:41 +0000 (01:44 +0000)]
am
325a5721: Merge "Properly describe exception" into mnc-dev
* commit '
325a57218e9f13cf696215006c230cac34b3c8a1':
Properly describe exception
Alan Viverette [Wed, 29 Apr 2015 01:44:36 +0000 (01:44 +0000)]
am
e861c8eb: Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev
* commit '
e861c8eb636bea97c1646cc3bfee1cd32670fe61':
Fix DatePicker max date, disabled day color, and arrow visibility
Wale Ogunwale [Wed, 29 Apr 2015 01:44:32 +0000 (01:44 +0000)]
am
b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev
* commit '
b1c9539d3fa11cf7573ed9faaade4872e1a952f0':
@hide resizeableActivity attribute and remove from public api
Jorim Jaggi [Wed, 29 Apr 2015 01:44:20 +0000 (01:44 +0000)]
am
b3a020a6: Merge "Fix build." into mnc-dev
* commit '
b3a020a6de45bbcb1329d8f820e569cfd0de9325':
Fix build.
Selim Cinek [Wed, 29 Apr 2015 01:44:14 +0000 (01:44 +0000)]
am
61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev
* commit '
61a75423648a0070406e9b7aeda1a55e173bd467':
Follow up CL for heads up notification refactoring
Yorke Lee [Wed, 29 Apr 2015 01:44:08 +0000 (01:44 +0000)]
am
f7143ce6: Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev
* commit '
f7143ce657aa735e92bcbb1287dea4d8a1c82e93':
Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public