Narayan Kamath
bb4ed9aa3a
am 815d9bb1: Merge "Add a static dependency on libbase."
...
* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
Add a static dependency on libbase.
2015-04-29 14:38:15 +00:00
Geoff Mendal
2d954c7b46
am eb3d1a1b: (-s ours) am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'eb3d1a1bd7c6c51c8b2701768f27121a17a20b36':
Import translations. DO NOT MERGE
2015-04-29 14:27:24 +00:00
John Spurlock
23e46a4e8d
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.
2015-04-29 14:27:19 +00:00
Geoff Mendal
eb3d1a1bd7
am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '62cb506f27374aecb414d8fa3f064c194d3c69ec':
Import translations. DO NOT MERGE
2015-04-29 14:11:39 +00:00
John Spurlock
2d67b2887c
am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
...
* commit '8dbcda1b33ad9cd1c19052a332404cc221da42ee':
Volume: Simple dialog footer, DND in quick settings.
2015-04-29 14:11:35 +00:00
Narayan Kamath
815d9bb178
Merge "Add a static dependency on libbase."
2015-04-29 14:09:03 +00:00
Geoff Mendal
62cb506f27
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-04-29 14:08:26 +00:00
Narayan Kamath
9c8ba9666d
Add a static dependency on libbase.
...
Used by libziparchive.
Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
2015-04-29 14:07:41 +00:00
Geoff Mendal
b312f926f6
Import translations. DO NOT MERGE
...
Change-Id: Ied1d50de849ab195e9f3c9e70c0f8e8dbf9104fe
Auto-generated-cl: translation import
2015-04-29 07:03:31 -07:00
John Spurlock
8dbcda1b33
Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
2015-04-29 14:02:52 +00:00
John Spurlock
d9c75dba75
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
2015-04-29 09:58:38 -04:00
Nicolas Prevot
41646474df
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.
2015-04-29 13:50:04 +00:00
Nicolas Prevot
4c4471e230
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.
2015-04-29 13:35:01 +00:00
Nicolas Prevot
1c4a44e577
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
2015-04-29 11:10:19 +00:00
Benjamin Franz
da8f7a176c
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
2015-04-29 09:35:38 +00:00
Benjamin Franz
af275e157a
am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev
...
* commit 'c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b':
Add status bar flag to disable quick settings
2015-04-29 09:15:20 +00:00
Benjamin Franz
c4aa3c781a
Merge "Add status bar flag to disable quick settings" into mnc-dev
2015-04-29 08:36:00 +00:00
Dongwon Kang
d3fad391e1
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.
2015-04-29 05:52:39 +00:00
Jeff Sharkey
572b107896
am 15c7f90c: am b42d6946: Method to wipe all adoptable disks.
...
* commit '15c7f90c8d84ce992659d0ec29bb0e60f1b603d1':
Method to wipe all adoptable disks.
2015-04-29 05:52:35 +00:00
Dongwon Kang
633a45a0d4
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.
2015-04-29 05:41:35 +00:00
Jeff Sharkey
a149ba0255
am aa4e35eb: am b36586a7: Split some VolumeInfo state into VolumeRecord.
...
* commit 'aa4e35eb6540806958cb37c5c564c5d20dd7a978':
Split some VolumeInfo state into VolumeRecord.
2015-04-29 05:41:33 +00:00
Jeff Sharkey
15c7f90c8d
am b42d6946: Method to wipe all adoptable disks.
...
* commit 'b42d694691e73d094df616fe78627ada7e1239ef':
Method to wipe all adoptable disks.
2015-04-29 05:41:30 +00:00
Dongwon Kang
25466e0a8f
Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
2015-04-29 05:34:26 +00:00
Dongwon Kang
21add3ecc9
TIF: throw an exception if an operation takes too long.
...
Bug: 19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136
2015-04-29 14:33:24 +09:00
Jeff Sharkey
aa4e35eb65
am b36586a7: Split some VolumeInfo state into VolumeRecord.
...
* commit 'b36586a7c9b7718f33961406537e27bbd9b16211':
Split some VolumeInfo state into VolumeRecord.
2015-04-29 05:29:50 +00:00
Jeff Sharkey
b42d694691
Method to wipe all adoptable disks.
...
Will be used by various classes doing factory reset.
Bug: 9433509
Change-Id: I0701abe00abc2fb9085ce1ffe6e28fb27c91ab51
2015-04-28 22:25:26 -07:00
Jeff Sharkey
b36586a7c9
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
2015-04-28 22:02:36 -07:00
Shawn Willden
b672afaa8c
am adbbba9f: Merge "Add missing error codes from keymaster_defs.h."
...
* commit 'adbbba9f1dc364e4d3911562fdb8f2e666922e2f':
Add missing error codes from keymaster_defs.h.
2015-04-29 04:54:33 +00:00
Alan Viverette
9c36ee9b4f
am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory"
...
* commit '2ddfcc4ade5d6db69808a340ae54280872559ec1':
Context leaks in EditText causes out of memory
2015-04-29 04:54:28 +00:00
David Friedman
cde209f2b6
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':
2015-04-29 04:33:11 +00:00
Shawn Willden
adbbba9f1d
Merge "Add missing error codes from keymaster_defs.h."
2015-04-29 04:30:18 +00:00
David Friedman
c69018daff
am 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '30565ed225e6d91c37b438a64f715725b1663058':
2015-04-29 04:20:41 +00:00
Alan Viverette
2ddfcc4ade
Merge "Context leaks in EditText causes out of memory"
2015-04-29 04:19:40 +00:00
David Friedman
a43b7e6177
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
2015-04-29 04:18:15 +00:00
David Friedman
1775e0b295
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
2015-04-29 04:08:29 +00:00
David Friedman
30565ed225
am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit 'a39e4d3716a10e84acbfc0813745ee4303f1edb2':
2015-04-29 04:05:47 +00:00
David Friedman
16bf47e8d6
am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '3d983deace20df9437bc9efebc67550f3904eee3':
Localized Android landing pages Bug: 19124242
2015-04-29 03:51:39 +00:00
David Friedman
a39e4d3716
am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '77ad81b5301bfbf1691bdad203dd70ce68ce40b3':
2015-04-29 03:48:52 +00:00
David Friedman
77ad81b530
am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit 'ff1bfac68b977f577d537172d87daa5c816be3b7':
Localized Android landing pages Bug: 19124242
2015-04-29 03:25:38 +00:00
David Friedman
3d983deace
am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '21a9fa471bcc57196a19e40ca29dbaa97233244c':
Localized Android landing pages Bug: 19124242
2015-04-29 03:25:15 +00:00
David Friedman
ff1bfac68b
am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit 'c637af9eee48334e6d8d65428734c8928e9bac55':
Localized Android landing pages Bug: 19124242
2015-04-29 03:13:59 +00:00
David Friedman
21a9fa471b
am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug: 19124242
2015-04-29 03:01:57 +00:00
David Friedman
c637af9eee
am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
...
* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug: 19124242
2015-04-29 03:01:10 +00:00
David Friedman
75f071df44
Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
2015-04-29 02:49:24 +00:00
Alex Klyubin
a65101cd49
am ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
...
* commit 'ecde03306541259d786aeac9a658f440a2e1b098':
Align AndroidKeyStore API with user auth API.
2015-04-29 02:01:16 +00:00
Jeff Brown
4b5a7b718e
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.
2015-04-29 02:01:11 +00:00
Fabrice Di Meglio
e5d4422be5
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
2015-04-29 02:01:06 +00:00
Christopher Tate
890b2a59e5
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
2015-04-29 02:01:02 +00:00
Amith Yamasani
5b9a5fef6d
am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev
...
* commit 'b3c7ad328d0a9467ed3864a84ed822720e970334':
Permissions control via profile/device owner admin
2015-04-29 02:00:50 +00:00
Simranjit Singh Kohli
150235b28a
am 7374dc35: am 1f1b88b2: Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev
...
* commit '7374dc3547128ed6330c9fbd99fc84e56ce97513':
AccountsDb Logging]: Introducing logging in accountsDb.
2015-04-29 02:00:45 +00:00