OSDN Git Service
Sanket Padawe [Tue, 16 Jun 2015 21:42:47 +0000 (21:42 +0000)]
am
3c2f469b: am
fc4e9cbd: am
7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
* commit '
3c2f469bf9d804bdb60bd0fea618cbc883db5ab6':
Add PBAP checkbox for BT pairing consent dialog.
Jason Monk [Tue, 16 Jun 2015 21:42:44 +0000 (21:42 +0000)]
am
464ad14d: am
808f7826: am
6e613472: Start all help intents as startActivityForResult
* commit '
464ad14d376358a8162854591f44071919c87a75':
Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 21:42:43 +0000 (21:42 +0000)]
am
27fe38eb: am
4c1f455c: am
744f2adb: Merge "Layout refinement for app lists" into mnc-dev
* commit '
27fe38eb2c3b10d28c570ae60221c7ae5c54dcbd':
Layout refinement for app lists
Sanket Padawe [Tue, 16 Jun 2015 21:23:09 +0000 (21:23 +0000)]
am
fc4e9cbd: am
7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
* commit '
fc4e9cbdf928b6b8bcbdd96a9940e0333a49193e':
Add PBAP checkbox for BT pairing consent dialog.
Jason Monk [Tue, 16 Jun 2015 21:23:08 +0000 (21:23 +0000)]
am
808f7826: am
6e613472: Start all help intents as startActivityForResult
* commit '
808f7826b1259c6f0344d5273b7855c93cfe44f7':
Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 21:23:07 +0000 (21:23 +0000)]
am
4c1f455c: am
744f2adb: Merge "Layout refinement for app lists" into mnc-dev
* commit '
4c1f455cac4ed69a1dec0ce5c75323301d288e1b':
Layout refinement for app lists
Sanket Padawe [Tue, 16 Jun 2015 20:06:46 +0000 (20:06 +0000)]
am
7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
* commit '
7171d6864fb4d8c1838b4ef1d65b6bb5274d3b53':
Add PBAP checkbox for BT pairing consent dialog.
Jason Monk [Tue, 16 Jun 2015 20:06:44 +0000 (20:06 +0000)]
am
6e613472: Start all help intents as startActivityForResult
* commit '
6e61347242ea8d9ac0645b2669f222696c65eec6':
Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 20:06:29 +0000 (20:06 +0000)]
am
744f2adb: Merge "Layout refinement for app lists" into mnc-dev
* commit '
744f2adb56ac0077a103c8e6e3b20f421eddc780':
Layout refinement for app lists
Sanket Padawe [Tue, 16 Jun 2015 15:24:04 +0000 (15:24 +0000)]
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
Jason Monk [Tue, 16 Jun 2015 14:31:38 +0000 (10:31 -0400)]
Start all help intents as startActivityForResult
So that the receiver may verify identity if they so desire...
Bug:
21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed
Jason Monk [Tue, 16 Jun 2015 13:17:01 +0000 (13:17 +0000)]
Merge "Layout refinement for app lists" into mnc-dev
Jason Monk [Fri, 12 Jun 2015 16:32:50 +0000 (12:32 -0400)]
Layout refinement for app lists
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding. This way they
should look the same.
Bug:
21727125
Bug:
21726922
Bug:
21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
Jeff Sharkey [Tue, 16 Jun 2015 05:40:30 +0000 (05:40 +0000)]
am
57922a1e: am
a26765c4: am
9a5550e9: Check new user restriction.
* commit '
57922a1ed4caa8b062ad0781aa52c38a59b8d8a7':
Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:28:40 +0000 (05:28 +0000)]
am
a26765c4: am
9a5550e9: Check new user restriction.
* commit '
a26765c461168f745913d505d6e993181e896a19':
Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:16:50 +0000 (05:16 +0000)]
am
9a5550e9: Check new user restriction.
* commit '
9a5550e9e6efe211b03d067eae2689f6ef5eb2d1':
Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:16:43 +0000 (05:16 +0000)]
am
96b09cf5: am
3538eb24: am
71c89a17: Merge "More storage UI updates." into mnc-dev
* commit '
96b09cf59f7554b05004fa7f8ad6da1c73e8f545':
More storage UI updates.
Jeff Sharkey [Tue, 16 Jun 2015 05:06:00 +0000 (05:06 +0000)]
am
3538eb24: am
71c89a17: Merge "More storage UI updates." into mnc-dev
* commit '
3538eb2410808484b8110d83543d6c926fa870c4':
More storage UI updates.
Jeff Sharkey [Tue, 16 Jun 2015 04:57:43 +0000 (04:57 +0000)]
am
71c89a17: Merge "More storage UI updates." into mnc-dev
* commit '
71c89a171acb1ddd63d10189c39c07134987bd2f':
More storage UI updates.
Jeff Sharkey [Fri, 20 Mar 2015 18:25:22 +0000 (11:25 -0700)]
Check new user restriction.
Change-Id: I8891a4347478c243a3f1a14cf8cdf9b4784c9fab
Jeff Sharkey [Tue, 16 Jun 2015 04:47:16 +0000 (04:47 +0000)]
Merge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 04:08:56 +0000 (21:08 -0700)]
More storage UI updates.
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space. Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.
Allocate a unique color for each private volume, and yell when a
volume is running low on space. Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage. Show
details dialog about "Other" and user storage items.
Shortcut into single private volume when it's the only device. Add
real eject icon.
Bug:
21756698,
20275574,
21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
Jim Miller [Tue, 16 Jun 2015 04:22:00 +0000 (04:22 +0000)]
am
861a64e8: am
6364e0a2: am
a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
861a64e8bfb3b77709a50f2223c355f43bfb867a':
Limit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 04:10:57 +0000 (04:10 +0000)]
am
6364e0a2: am
a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
6364e0a26a04cc048e8a0ff1dd9c0ed90cd45295':
Limit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 04:00:37 +0000 (04:00 +0000)]
am
a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
a4f8aae4be4040685f88c79006d2cfee42f96504':
Limit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
Jim Miller [Tue, 16 Jun 2015 03:41:02 +0000 (20:41 -0700)]
Limit number of fingerprint templates that can be enrolled per device user
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug
20731847
Change-Id: I3975290fa8eb2106467493aab6102015697e012c
On branch max_fingerprint
Sean Francis-Lyon [Tue, 16 Jun 2015 01:49:46 +0000 (01:49 +0000)]
am
af02ae0f: am
d1f4be21: am
c44d0ef1: show old legal text in backup settings if full data backup is disabled
* commit '
af02ae0fb7d41435531d185031a2e27952c113a4':
show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Tue, 16 Jun 2015 01:42:58 +0000 (01:42 +0000)]
am
d1f4be21: am
c44d0ef1: show old legal text in backup settings if full data backup is disabled
* commit '
d1f4be219d68179c0aea245e7b66d393444688a7':
show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Tue, 16 Jun 2015 01:32:02 +0000 (01:32 +0000)]
am
c44d0ef1: show old legal text in backup settings if full data backup is disabled
* commit '
c44d0ef1dc67466fe59c1a26a657c2f9043c948b':
show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Sat, 13 Jun 2015 00:46:41 +0000 (17:46 -0700)]
show old legal text in backup settings if full data backup is disabled
Change-Id: Ifc4fa5c4a6180fd4ceb41ca66dc2dd6a58f4f086
Adrian Roos [Tue, 16 Jun 2015 00:18:16 +0000 (00:18 +0000)]
am
b57ca0ac: am
5d912c35: am
bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
* commit '
b57ca0aceaed55b67b91e3fc6d610503c2a1ac0b':
Use AssistUtils.getAssistInfo
Adrian Roos [Tue, 16 Jun 2015 00:05:17 +0000 (00:05 +0000)]
am
5d912c35: am
bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
* commit '
5d912c353145b893f4175fdff1ab488b0265cd4b':
Use AssistUtils.getAssistInfo
Adrian Roos [Mon, 15 Jun 2015 23:56:53 +0000 (23:56 +0000)]
am
bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
* commit '
bada978ec3eab48564c29eb4f8169e88975a2da0':
Use AssistUtils.getAssistInfo
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Use AssistUtils.getAssistInfo" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 20:32:58 +0000 (13:32 -0700)]
Use AssistUtils.getAssistInfo
Use consistent logic with SystemUI for determining
default assist component.
Bug:
21780590
Change-Id: I1313b79ce3bb75944889e3ceccb4a2e6bb23e824
Amit Mahajan [Mon, 15 Jun 2015 22:50:10 +0000 (22:50 +0000)]
am
32d93f34: am
5282bd71: am
be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
* commit '
32d93f349141ba1be95009dcb7abec121a13595f':
Change to trigger client initiated OMA-DM session on System update req.
Amit Mahajan [Mon, 15 Jun 2015 22:39:02 +0000 (22:39 +0000)]
am
5282bd71: am
be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
* commit '
5282bd71c9128bd53703b3381be0697afc7baf2a':
Change to trigger client initiated OMA-DM session on System update req.
Amit Mahajan [Mon, 15 Jun 2015 22:29:00 +0000 (22:29 +0000)]
am
be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
* commit '
be1b22e88ee24a9d53c1871da360cf7b56f4da0b':
Change to trigger client initiated OMA-DM session on System update req.
Amit Mahajan [Mon, 15 Jun 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 20:14:24 +0000 (20:14 +0000)]
am
f2903eda: am
3fdfabcd: am
dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
* commit '
f2903edadcc785135fb07a26655bf80476da35ab':
Settings: Remove unreachable "Battery Info" screen.
John Spurlock [Mon, 15 Jun 2015 20:01:55 +0000 (20:01 +0000)]
am
3fdfabcd: am
dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
* commit '
3fdfabcd4576b27c37608656c277686d73833b57':
Settings: Remove unreachable "Battery Info" screen.
Dianne Hackborn [Mon, 15 Jun 2015 19:49:39 +0000 (19:49 +0000)]
am
f4d4440f: am
f7c184f0: am
3f98c0ce: Fix issue #
21813831: Need API for asking to be added to power whitelist
* commit '
f4d4440fd4318a83ce83090a744171e336d6fd65':
Fix issue #
21813831: Need API for asking to be added to power whitelist
John Spurlock [Mon, 15 Jun 2015 19:49:30 +0000 (19:49 +0000)]
am
dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
* commit '
dddd589d8f0de00c192022ea9bd87f32a734343b':
Settings: Remove unreachable "Battery Info" screen.
Dianne Hackborn [Mon, 15 Jun 2015 19:37:09 +0000 (19:37 +0000)]
am
f7c184f0: am
3f98c0ce: Fix issue #
21813831: Need API for asking to be added to power whitelist
* commit '
f7c184f05e4f2c70835dfb7da48cc1a95e38a6e4':
Fix issue #
21813831: Need API for asking to be added to power whitelist
John Spurlock [Mon, 15 Jun 2015 19:36:45 +0000 (19:36 +0000)]
Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 19:24:16 +0000 (15:24 -0400)]
Settings: Remove unreachable "Battery Info" screen.
Bug:
21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
Dianne Hackborn [Mon, 15 Jun 2015 19:24:10 +0000 (19:24 +0000)]
am
3f98c0ce: Fix issue #
21813831: Need API for asking to be added to power whitelist
* commit '
3f98c0ce510ba95f8ecb3d815a4e722002fcf9f2':
Fix issue #
21813831: Need API for asking to be added to power whitelist
Dianne Hackborn [Sat, 13 Jun 2015 01:13:54 +0000 (18:13 -0700)]
Fix issue #
21813831: Need API for asking to be added to power whitelist
When launching the battery whitelist for a particular app, we now
default to the app being asked to enable adding to the whitelist, and
dismissing the dialog will dismiss the entire whitelist UI.
You can now launch the whitelist without specifying an app to just
get the regular UI.
Change-Id: Idf3840b8a30febe71fbd600969c257d72809643f
Geoff Mendal [Mon, 15 Jun 2015 16:08:08 +0000 (16:08 +0000)]
am
f665e53c: (-s ours) am
920a4b62: (-s ours) am
f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f665e53c88ebaae27783787c34bead2575c3501a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 15:59:44 +0000 (15:59 +0000)]
am
920a4b62: (-s ours) am
f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
920a4b62a36ec9a1e64e6a559425ec03ff760801':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 15:48:55 +0000 (15:48 +0000)]
am
f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f4d7bd4f49077602c7d3fd096fe32b2b17f76797':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 15:36:59 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:36:21 +0000 (15:36 +0000)]
am
d6e65040: am
dfe186f5: am
49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev
* commit '
d6e65040f5030a5b2c3db29ca5f5f8735fcdecec':
Fix bad theming on owner-info
Jason Monk [Mon, 15 Jun 2015 15:24:58 +0000 (15:24 +0000)]
am
89a770fb: am
f7b0dfd6: am
f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
* commit '
89a770fb3bd86e4089e7858664380c7d7f21e578':
Don't auto-focus text fields in hotspot dialog
Jason Monk [Mon, 15 Jun 2015 15:24:53 +0000 (15:24 +0000)]
am
dfe186f5: am
49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev
* commit '
dfe186f57c4f8cc04ca3b179e3dcae6d6c76fbc0':
Fix bad theming on owner-info
Jason Monk [Mon, 15 Jun 2015 15:12:48 +0000 (15:12 +0000)]
am
f7b0dfd6: am
f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
* commit '
f7b0dfd6aeff9c02e479c2ce6f2ddc97baa09331':
Don't auto-focus text fields in hotspot dialog
Jason Monk [Mon, 15 Jun 2015 15:11:59 +0000 (15:11 +0000)]
am
49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev
* commit '
49ecfcd690a73112024df188924892772408d170':
Fix bad theming on owner-info
Jason Monk [Mon, 15 Jun 2015 15:05:33 +0000 (15:05 +0000)]
Merge "Fix bad theming on owner-info" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:58:50 +0000 (10:58 -0400)]
Fix bad theming on owner-info
Bug:
21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
Jason Monk [Mon, 15 Jun 2015 15:00:20 +0000 (15:00 +0000)]
am
f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
* commit '
f0fe5c58e2274a550321f936c125c691f7a1646b':
Don't auto-focus text fields in hotspot dialog
Geoff Mendal [Mon, 15 Jun 2015 14:57:05 +0000 (07:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44
Auto-generated-cl: translation import
Jason Monk [Mon, 15 Jun 2015 14:51:28 +0000 (14:51 +0000)]
Merge "Don't auto-focus text fields in hotspot dialog" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:48:00 +0000 (14:48 +0000)]
am
637cb00c: am
20a837ea: am
6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
* commit '
637cb00c9db191b8052d9aa26e6e873a05d4f1b9':
Handle switch of ssid to CharSequence (for spans)
Jason Monk [Mon, 15 Jun 2015 14:45:46 +0000 (10:45 -0400)]
Don't auto-focus text fields in hotspot dialog
Instead focus the parent, so that the fields can be seen on smaller
screens before editing.
Bug:
19095568
Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
Jason Monk [Mon, 15 Jun 2015 14:35:25 +0000 (14:35 +0000)]
am
20a837ea: am
6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
* commit '
20a837ea52a77efa578aef58b7e108f59c3a8bcb':
Handle switch of ssid to CharSequence (for spans)
Geoff Mendal [Mon, 15 Jun 2015 14:32:28 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 15 Jun 2015 14:26:30 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb22432cce54225e2d9f02976473953daa7db514
Auto-generated-cl: translation import
Jason Monk [Mon, 15 Jun 2015 14:23:54 +0000 (14:23 +0000)]
am
6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
* commit '
6f229435367e6b5a775f42552be280fa35df1d56':
Handle switch of ssid to CharSequence (for spans)
Jason Monk [Mon, 15 Jun 2015 14:14:50 +0000 (14:14 +0000)]
Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
Paul Jensen [Mon, 15 Jun 2015 14:11:13 +0000 (14:11 +0000)]
am
2d3f521f: am
020dc2e1: am
04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '
2d3f521fe7fc8880c3fe0d9d19d471d9be8b15a3':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Jason Monk [Mon, 15 Jun 2015 14:08:40 +0000 (10:08 -0400)]
Handle switch of ssid to CharSequence (for spans)
Change to reference the string directly for places like search,
etc.
Bug:
20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
Paul Jensen [Mon, 15 Jun 2015 13:58:58 +0000 (13:58 +0000)]
am
020dc2e1: am
04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '
020dc2e151c49e01da86a7bc597d5d8dd3ef335c':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Paul Jensen [Mon, 15 Jun 2015 13:45:21 +0000 (13:45 +0000)]
am
04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
* commit '
04e3fca391b9d4fd0493f7ef38ab4f9b8ddafa95':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Paul Jensen [Mon, 15 Jun 2015 13:36:57 +0000 (13:36 +0000)]
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
Jeff Sharkey [Mon, 15 Jun 2015 04:44:40 +0000 (04:44 +0000)]
am
89751b05: am
7384b67e: am
edb7b0d9: New storage dialogs.
* commit '
89751b0571f37d5eaea5b0c2e34a333ec8f638cc':
New storage dialogs.
Jeff Sharkey [Mon, 15 Jun 2015 04:32:54 +0000 (04:32 +0000)]
am
7384b67e: am
edb7b0d9: New storage dialogs.
* commit '
7384b67e159eed75a6e8744da27ee3eaa2ed308a':
New storage dialogs.
Jeff Sharkey [Mon, 15 Jun 2015 04:20:55 +0000 (04:20 +0000)]
am
edb7b0d9: New storage dialogs.
* commit '
edb7b0d9a900a4a560d0777032600b52f38efd23':
New storage dialogs.
Jeff Sharkey [Mon, 15 Jun 2015 04:07:27 +0000 (21:07 -0700)]
New storage dialogs.
Show a helpful dialog when a volume is unmounted or unmountable, or
when disk is unsupported. Add both missing private volumes and
unsupported disks in the storage list. Dialog to confirm when
forgetting private volume.
Finish volume detail activities when the volume becomes unmounted.
Show used space instead of free space to match string. When init'ing
a volume on non-adoptable disk, just format as public.
Bug:
21737573,
21666225,
21737666,
21471429
Change-Id: Id60d5a398e2b7923ebebdc5cfaef33248d8d77bb
Nick Kralevich [Sat, 13 Jun 2015 03:43:23 +0000 (03:43 +0000)]
am
e1083155: am
bc8985c6: am
9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
* commit '
e10831550ede1de3e0e00cb6d4a82319765c1f67':
Let UsbDeviceManager choose the appropriate function default
Nick Kralevich [Sat, 13 Jun 2015 03:43:22 +0000 (03:43 +0000)]
am
a864e46b: am
20a0da89: am
64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
* commit '
a864e46b47ea20694ce9366295d997a1debffa02':
Fix bad USB configuration under Developer Options
Nick Kralevich [Sat, 13 Jun 2015 03:31:21 +0000 (03:31 +0000)]
am
bc8985c6: am
9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
* commit '
bc8985c6ee49e0feff3a48c399a03d8d882ea6bc':
Let UsbDeviceManager choose the appropriate function default
Nick Kralevich [Sat, 13 Jun 2015 03:31:18 +0000 (03:31 +0000)]
am
20a0da89: am
64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
* commit '
20a0da89089984b12805b707c8644bb4413389c4':
Fix bad USB configuration under Developer Options
Nick Kralevich [Sat, 13 Jun 2015 03:19:37 +0000 (03:19 +0000)]
am
9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
* commit '
9405a81f7ac4116e2715f5739fb5d7fd5c6458d8':
Let UsbDeviceManager choose the appropriate function default
Nick Kralevich [Sat, 13 Jun 2015 03:19:36 +0000 (03:19 +0000)]
am
64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
* commit '
64a8032f44da51d0422cb52af4631c7ae2545731':
Fix bad USB configuration under Developer Options
Nick Kralevich [Sat, 13 Jun 2015 03:12:25 +0000 (03:12 +0000)]
Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
Nick Kralevich [Sat, 13 Jun 2015 03:12:07 +0000 (03:12 +0000)]
Merge "Fix bad USB configuration under Developer Options" into mnc-dev
Sanket Padawe [Sat, 13 Jun 2015 01:09:45 +0000 (18:09 -0700)]
Add PBAP checkbox for BT pairing consent dialog.
Bug:
20488109
Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
Makoto Onuki [Sat, 13 Jun 2015 00:35:14 +0000 (00:35 +0000)]
am
e0115ee5: am
75651de4: am
97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
* commit '
e0115ee5725541dfb6cbc42de70adfd1767edde5':
Add simple null checks to StorageWizard*, also listen to...
Makoto Onuki [Sat, 13 Jun 2015 00:23:15 +0000 (00:23 +0000)]
am
75651de4: am
97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
* commit '
75651de4d17200d4aa0ae083303f8214c7b7478b':
Add simple null checks to StorageWizard*, also listen to...
Nick Kralevich [Sat, 13 Jun 2015 00:16:32 +0000 (17:16 -0700)]
Let UsbDeviceManager choose the appropriate function default
Rather than hardcoding MTP as the appropriate default when the user
selects "Charger Only", call UsbDeviceManager.setCurrentFunction(null).
Null is intended to restore the default function, which is appropriate
for charging only.
Bug:
21429947
Change-Id: I9ee633bcf2f95f9937861c234ab044873202d41b
Makoto Onuki [Sat, 13 Jun 2015 00:09:57 +0000 (00:09 +0000)]
am
97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
* commit '
97d102d9e207f3379ef94929e239de848c784754':
Add simple null checks to StorageWizard*, also listen to...
Makoto Onuki [Fri, 12 Jun 2015 23:57:53 +0000 (23:57 +0000)]
Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
Nick Kralevich [Fri, 12 Jun 2015 23:30:45 +0000 (16:30 -0700)]
Fix bad USB configuration under Developer Options
The USB configuration screen under Developer Options hasn't been
updated for the new USB access control changes. Update it.
1) Ensure that the default in Development Settings is "Charger Only".
2) Changing USB mode in developer settings only changes the USB function.
It doesn't unlock any USB data.
Bug:
21258972
Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
Makoto Onuki [Thu, 11 Jun 2015 23:16:22 +0000 (16:16 -0700)]
Add simple null checks to StorageWizard*, also listen to...
the disk destroyed event.
Bug
21336042
Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
Selim Cinek [Fri, 12 Jun 2015 22:29:20 +0000 (22:29 +0000)]
am
827c5419: am
0abc4fb6: am
ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
* commit '
827c5419fa8e68bd0d7807e1799344e7760f1363':
Added an introduction to the fingerprint enrollment
Selim Cinek [Fri, 12 Jun 2015 22:22:27 +0000 (22:22 +0000)]
am
0abc4fb6: am
ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
* commit '
0abc4fb6e3c055e4107edd5a32466b4f4c90a7a8':
Added an introduction to the fingerprint enrollment
Selim Cinek [Fri, 12 Jun 2015 22:11:56 +0000 (22:11 +0000)]
am
ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
* commit '
ee5db351ac773f42d2fb2674545b82d1d1d0cdd5':
Added an introduction to the fingerprint enrollment
Selim Cinek [Fri, 12 Jun 2015 21:57:44 +0000 (21:57 +0000)]
Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
Makoto Onuki [Fri, 12 Jun 2015 16:55:19 +0000 (16:55 +0000)]
am
0b5b05e2: am
20468a11: am
e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev
* commit '
0b5b05e2f5883868aea2d8bb36ef1c95d643722d':
Promote "add service" from menu to list item