OSDN Git Service
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 15:16:29 +0000 (15:16 +0000)]
am
87e918cd: am
2f279c3a: am
2cd50c45: am
03b73068: am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
87e918cdf0ff92c8beee43b9f0be514d608c7b4c':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 15:05:49 +0000 (16:05 +0100)]
resolved conflicts for merge of
8eade69d to master
Change-Id: Id2a2269b506c2ffa06dcfd3a02b32eced5e7632b
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:35 +0000 (12:55 +0000)]
am
2f279c3a: am
2cd50c45: am
03b73068: am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
2f279c3a12e58806d8efb48bbeef031842a0ed80':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:10 +0000 (12:55 +0000)]
am
89be2eea: am
38a510df: am
215af288: am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
89be2eeab0738e7db8d945ff1267dc9bf8fdaeb2':
Making Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:25:55 +0000 (12:25 +0000)]
am
2cd50c45: am
03b73068: am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
2cd50c45da99fa002375ad80a51d0c672cc09572':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:12:30 +0000 (12:12 +0000)]
am
03b73068: am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
03b73068128807b4308185d04ab4688e71e02000':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:57:34 +0000 (11:57 +0000)]
am
296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '
296e0aff022196ef2fec934878d8721828bea3f1':
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:45:03 +0000 (11:45 +0000)]
Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:37:51 +0000 (11:37 +0000)]
am
38a510df: am
215af288: am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
38a510df76a596007d9425270d8a927018dc2ae2':
Making Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:25:44 +0000 (11:25 +0000)]
am
215af288: am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
215af288957eb64235af7a67af2143d1caf37428':
Making Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:10:45 +0000 (11:10 +0000)]
am
461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
* commit '
461a48bac97c24706fd3b2f789648f61a42def42':
Making Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 10:54:05 +0000 (10:54 +0000)]
Merge "Making Settings > Storage multiprofile aware" into mnc-dev
Wei Liu [Wed, 8 Jul 2015 02:06:51 +0000 (02:06 +0000)]
am
d5e276fa: am
27e39542: am
e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
* commit '
d5e276fa6e53ab940bec3af0610df3daae2c0052':
Move NetworkPolicyEditor from Settings packge to settingslib.
Christopher Tate [Wed, 8 Jul 2015 02:06:49 +0000 (02:06 +0000)]
am
0556a0a9: am
6c444a03: am
d0528b69: am
fe71156d: am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
0556a0a94974f202c92d9f31fa86b00857c51ab9':
App link handling is not just for "official" verified handlers
Amith Yamasani [Wed, 8 Jul 2015 02:06:48 +0000 (02:06 +0000)]
am
4a902ffd: am
0531c255: am
8a62bf97: am
8e9aca37: am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
4a902ffd0b8b19493d5079bd75faed6a61f580c6':
Use localized name for guest user
Wei Liu [Wed, 8 Jul 2015 01:40:05 +0000 (01:40 +0000)]
am
27e39542: am
e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
* commit '
27e395427eef95fea47f06b5cc7bbba0e7853016':
Move NetworkPolicyEditor from Settings packge to settingslib.
Christopher Tate [Wed, 8 Jul 2015 01:39:59 +0000 (01:39 +0000)]
am
6c444a03: am
d0528b69: am
fe71156d: am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
6c444a03f671eb4439792506f09efe8b6b3fdb59':
App link handling is not just for "official" verified handlers
Amith Yamasani [Wed, 8 Jul 2015 01:36:49 +0000 (01:36 +0000)]
am
0531c255: am
8a62bf97: am
8e9aca37: am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
0531c255e6d00498e06811f032744b40fc453e80':
Use localized name for guest user
Wei Liu [Wed, 8 Jul 2015 00:42:50 +0000 (00:42 +0000)]
am
e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
* commit '
e0021c426c75ea8a737714f0b8bb27988ac3a51f':
Move NetworkPolicyEditor from Settings packge to settingslib.
Christopher Tate [Wed, 8 Jul 2015 00:24:08 +0000 (00:24 +0000)]
am
d0528b69: am
fe71156d: am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
d0528b69d4ad70fdad8e218e618cd875eef96f4f':
App link handling is not just for "official" verified handlers
Wei Liu [Tue, 7 Jul 2015 22:37:11 +0000 (15:37 -0700)]
Move NetworkPolicyEditor from Settings packge to settingslib.
Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813
Christopher Tate [Wed, 8 Jul 2015 00:08:17 +0000 (00:08 +0000)]
am
fe71156d: am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
fe71156d076792eebd250dc22c5d2e9485f9cf58':
App link handling is not just for "official" verified handlers
Christopher Tate [Tue, 7 Jul 2015 23:49:11 +0000 (23:49 +0000)]
am
8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev
* commit '
8023385e56e472a55e9c6f5034e04a10f1088f57':
App link handling is not just for "official" verified handlers
Christopher Tate [Tue, 7 Jul 2015 23:35:52 +0000 (23:35 +0000)]
Merge "App link handling is not just for "official" verified handlers" into mnc-dev
Christopher Tate [Wed, 1 Jul 2015 23:52:43 +0000 (16:52 -0700)]
App link handling is not just for "official" verified handlers
Allow apps to be enabled as link handlers for their accepted domains
even when they are not the "official" apps for those domains.
Also clean up a bunch of inconsistent/wrong state reporting in the UI.
Bug
22069429
Change-Id: Ic3b2bcc476dfc30085d3df7412b02bdc5d53df6d
Amith Yamasani [Tue, 7 Jul 2015 21:09:42 +0000 (21:09 +0000)]
am
8a62bf97: am
8e9aca37: am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
8a62bf97e614d7c644ce600b6e14a7aab79892f6':
Use localized name for guest user
Amith Yamasani [Tue, 7 Jul 2015 20:54:18 +0000 (20:54 +0000)]
am
8e9aca37: am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
8e9aca37c6045aeffe83f13a0664cb950a7f7fef':
Use localized name for guest user
Amith Yamasani [Tue, 7 Jul 2015 20:37:31 +0000 (20:37 +0000)]
am
7ac21204: Merge "Use localized name for guest user" into mnc-dev
* commit '
7ac21204e16c797cc4f818ccc51509d425ffaf80':
Use localized name for guest user
Amith Yamasani [Tue, 7 Jul 2015 20:20:03 +0000 (20:20 +0000)]
Merge "Use localized name for guest user" into mnc-dev
Zoltan Szatmary-Ban [Wed, 1 Jul 2015 15:45:34 +0000 (16:45 +0100)]
Making Settings > Storage multiprofile aware
Also fixing the order of preferences there.
Bug:
22223456
Bug:
22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
Amith Yamasani [Tue, 7 Jul 2015 17:13:12 +0000 (10:13 -0700)]
Use localized name for guest user
Rather than use the stored name, which depends on the language
in use when the Guest was created, always try to use the localized
word for Guest.
Bug:
22205776
Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f
Zoltan Szatmary-Ban [Tue, 7 Jul 2015 12:24:07 +0000 (13:24 +0100)]
Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Bug:
22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
Jorim Jaggi [Tue, 7 Jul 2015 00:32:56 +0000 (00:32 +0000)]
am
bbd59cc2: am
21b05211: am
a0357604: am
30001127: am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
bbd59cc252ec037c5b385b2c1c74c39f00e27c49':
Text changes to assist & voice input
Jeff Sharkey [Tue, 7 Jul 2015 00:31:45 +0000 (00:31 +0000)]
am
fe7cea03: am
41e81016: am
fe015ffe: am
355c13d2: am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
fe7cea03af1b5fca75a0e8931945c8e288a5d7ae':
Fix init order so we have something to measure.
Jeff Sharkey [Tue, 7 Jul 2015 00:31:43 +0000 (00:31 +0000)]
am
b126a4ea: am
084dd048: am
fc963764: am
bdb64bf1: am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
b126a4ea4abffecd9580b1c56cde22f58e7f742d':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jorim Jaggi [Mon, 6 Jul 2015 22:32:41 +0000 (22:32 +0000)]
am
21b05211: am
a0357604: am
30001127: am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
21b05211955ed9646324eb5f1c1c6a48a596d355':
Text changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 21:33:39 +0000 (21:33 +0000)]
am
a0357604: am
30001127: am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
a03576049fb71b42829304a46740a2696a233e29':
Text changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 21:20:03 +0000 (21:20 +0000)]
am
30001127: am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
30001127b22ef39e02155919adaa3906829c9688':
Text changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 21:04:31 +0000 (21:04 +0000)]
am
2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '
2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
Text changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 20:48:39 +0000 (20:48 +0000)]
Merge "Text changes to assist & voice input" into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 19:18:52 +0000 (19:18 +0000)]
am
41e81016: am
fe015ffe: am
355c13d2: am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
41e81016f6a2720bf86268fd9562fa4b9654b619':
Fix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 19:18:51 +0000 (19:18 +0000)]
am
084dd048: am
fc963764: am
bdb64bf1: am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
084dd0487cc310e6aed81933a32d7f23b39797cf':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 19:02:19 +0000 (19:02 +0000)]
am
fe015ffe: am
355c13d2: am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
fe015ffe40c19d60d11b394790e259c513f15ef8':
Fix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 19:02:18 +0000 (19:02 +0000)]
am
fc963764: am
bdb64bf1: am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
fc963764ab93bd2e6fce2a214f9cc992dbceda73':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jorim Jaggi [Mon, 6 Jul 2015 18:48:27 +0000 (11:48 -0700)]
Text changes to assist & voice input
Bug:
22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50
Jeff Sharkey [Mon, 6 Jul 2015 18:45:37 +0000 (18:45 +0000)]
am
355c13d2: am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
355c13d294a6c572637571d7df6369916e92394d':
Fix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 18:45:35 +0000 (18:45 +0000)]
am
bdb64bf1: am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
bdb64bf194c882242af6d2c30cdb421a06cce69a':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 18:12:56 +0000 (18:12 +0000)]
am
66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit '
66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
Fix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 18:12:55 +0000 (18:12 +0000)]
am
7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit '
7616b00bb5968382c5f49394fc842049f7ce9185':
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 18:00:32 +0000 (18:00 +0000)]
Merge "Fix init order so we have something to measure." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:51 +0000 (17:57 +0000)]
Merge changes from topic 'mig' into mnc-dev
* changes:
Fix some ordering, colors, and accessibility bugs.
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 17:17:42 +0000 (10:17 -0700)]
Fix init order so we have something to measure.
Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.
Bug:
22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea
Geoff Mendal [Mon, 6 Jul 2015 16:08:19 +0000 (16:08 +0000)]
am
7f39ae10: (-s ours) am
b9819796: (-s ours) am
1c2260a1: (-s ours) am
c869c959: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
7f39ae1030920ac3d3a2ae4c6cfa1fb028e988e9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:53:50 +0000 (15:53 +0000)]
am
b9819796: (-s ours) am
1c2260a1: (-s ours) am
c869c959: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
b9819796dde4546b8a88983a7a8da810d16dd7d4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:33:03 +0000 (15:33 +0000)]
am
1c2260a1: (-s ours) am
c869c959: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
1c2260a107cd5ffa708e8addf2501014d86dc37e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:17:10 +0000 (15:17 +0000)]
am
c869c959: (-s ours) am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
c869c9597546c9e8f39bc71e0f98b10b341d9e73':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:02:23 +0000 (15:02 +0000)]
am
e21573da: (-s ours) Import translations. DO NOT MERGE
* commit '
e21573da9205343e5b531f468b534a1bf02098fe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 14:49:17 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ca583a0b6b57e1c1cc27e5aaae009e85f906b86
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Jul 2015 14:13:18 +0000 (07:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaaba64c90d35db2817b0a889ab58b398b7f9d8b7
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 6 Jul 2015 05:09:07 +0000 (22:09 -0700)]
Fix some ordering, colors, and accessibility bugs.
When adding preferences to public/private details screens, always
add in-order when rebuilding. Hacky fix for broken summary text and
eject image color tints.
Fix crash when device rotated during partitioning. Set correct
accessibility titles in all wizard steps.
Bug:
22098044,
21376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
Jeff Sharkey [Sun, 5 Jul 2015 21:17:40 +0000 (14:17 -0700)]
Handle missing migration source volume.
Users can try migrating primary storage while the current location
is missing/unmounted. Fail gracefully instead of runtime restarting.
Bug:
21927076
Change-Id: I54b92487faf9e62d5d309734bf4c436a9259d156
Svetoslav [Sat, 4 Jul 2015 08:05:35 +0000 (08:05 +0000)]
Marco Nelissen [Sat, 4 Jul 2015 08:04:30 +0000 (08:04 +0000)]
am
a0918440: am
f35bd641: am
b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
* commit '
a0918440803bcfa1d28472d70dd0e37ca79814fb':
Fix USB mode development setting
Daichi Hirono [Fri, 3 Jul 2015 02:14:03 +0000 (02:14 +0000)]
Merge "Use 'setup' header illust before selecting storage type."
Daichi Hirono [Thu, 2 Jul 2015 08:54:29 +0000 (17:54 +0900)]
Show bar graphs for internal storage items (Apps, images, video etc.).
BUG=
21898434
Change-Id: I8285088c7bef82bbd63fa38d6a95180079acd195
Daichi Hirono [Thu, 2 Jul 2015 06:38:39 +0000 (15:38 +0900)]
Use 'setup' header illust before selecting storage type.
Previously the storage setup wizard shows 'internal' header illust before user
selects storage type. The CL turns the initial illust into 'setup' header
illust.
BUG=
22211635
Change-Id: Ie429a6197d210e0bd1ef8d0af6abb6f83295ac50
Svetoslav [Thu, 2 Jul 2015 02:01:11 +0000 (02:01 +0000)]
Svetoslav [Thu, 2 Jul 2015 01:47:59 +0000 (01:47 +0000)]
Svetoslav [Thu, 2 Jul 2015 01:33:32 +0000 (18:33 -0700)]
Fix build
Change-Id: I658528a9b0a8a281a2b30b2915c1be6963759378
Marco Nelissen [Thu, 2 Jul 2015 01:02:48 +0000 (01:02 +0000)]
am
f35bd641: am
b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
* commit '
f35bd64130ceb668a8fee544ef3b888f51d3eb14':
Fix USB mode development setting
Marco Nelissen [Thu, 2 Jul 2015 00:46:53 +0000 (00:46 +0000)]
am
b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
* commit '
b8b20a503255da8097d64a2f1554d118f8e3c424':
Fix USB mode development setting
Marco Nelissen [Wed, 1 Jul 2015 19:13:43 +0000 (19:13 +0000)]
Merge "Fix USB mode development setting" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 17:24:44 +0000 (17:24 +0000)]
am
5393ac02: (-s ours) am
ad44e83e: (-s ours) am
85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
5393ac023622a3dc7db92c723294d6f2ec96c0d2':
Import translations. DO NOT MERGE
Jason Monk [Wed, 1 Jul 2015 17:24:42 +0000 (17:24 +0000)]
Avish Shah [Wed, 1 Jul 2015 17:24:41 +0000 (17:24 +0000)]
am
bd17cc35: am
76ffaaa2: am
ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
* commit '
bd17cc3560c3697e8319e3012ebcde4c659a55d2':
Device Discoverability not set properly when Bluetooth is toggled
Geoff Mendal [Wed, 1 Jul 2015 17:12:43 +0000 (17:12 +0000)]
am
ad44e83e: (-s ours) am
85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ad44e83e0acb043e7069f7761300ce265adc6ba0':
Import translations. DO NOT MERGE
Jason Monk [Wed, 1 Jul 2015 17:12:42 +0000 (17:12 +0000)]
Avish Shah [Wed, 1 Jul 2015 17:12:41 +0000 (17:12 +0000)]
am
76ffaaa2: am
ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
* commit '
76ffaaa238b20cc103e8a08a22d9db1f5990ccff':
Device Discoverability not set properly when Bluetooth is toggled
Geoff Mendal [Wed, 1 Jul 2015 16:21:50 +0000 (16:21 +0000)]
am
85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
85a71d6a622eef2cc5258e737c305227cebe2e95':
Import translations. DO NOT MERGE
Jason Monk [Wed, 1 Jul 2015 16:21:31 +0000 (16:21 +0000)]
Avish Shah [Wed, 1 Jul 2015 16:19:36 +0000 (16:19 +0000)]
am
ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
* commit '
ad1f28cde0ec117a0d526bae61fb661587914f33':
Device Discoverability not set properly when Bluetooth is toggled
Marco Nelissen [Tue, 30 Jun 2015 21:52:04 +0000 (14:52 -0700)]
Fix USB mode development setting
USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.
Bug:
22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e
Geoff Mendal [Wed, 1 Jul 2015 15:42:32 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 14:52:03 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibe88fd3db790a357712803481a4a3dc2befe22cc
Auto-generated-cl: translation import
Jason Monk [Wed, 1 Jul 2015 14:36:30 +0000 (10:36 -0400)]
Avoid crashing
Bug:
22202631
Change-Id: I1980f77ae4300dbd19d6829dc5974bab0b88d612
Geoff Mendal [Wed, 1 Jul 2015 14:14:12 +0000 (07:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95ed838f9970f111b844313ff244ae1b4b238937
Auto-generated-cl: translation import
Avish Shah [Fri, 19 Jun 2015 11:20:39 +0000 (16:50 +0530)]
Device Discoverability not set properly when Bluetooth is toggled
Issue:
When BT is turned off/on staying in the same BT Settings
screen discoverability was not set again.
Fix:
Handle setting discoverability Bluetooth state change
intents also when BT state is turned ON.
Bug:
21944289
Change-Id: Ic3c8d476c53673b21d40ea2bd9669758d89c2aee
Adam Lesinski [Wed, 1 Jul 2015 01:24:51 +0000 (01:24 +0000)]
am
b285f018: am
09948d48: am
56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
* commit '
b285f018beacb966ef553df9bda48f46e0357984':
Update FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Wed, 1 Jul 2015 01:06:54 +0000 (01:06 +0000)]
am
09948d48: am
56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
* commit '
09948d4804f34d76f8e0987efec7b313eb03e3ee':
Update FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Wed, 1 Jul 2015 00:53:08 +0000 (00:53 +0000)]
am
56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
* commit '
56594c6d61c63d6cab28b32f431f6f0d9c84af91':
Update FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Sat, 27 Jun 2015 01:05:37 +0000 (18:05 -0700)]
Update FakeUid to implement new method defined in BatteryStats.Uid
Bug:
21498425
Change-Id: I956c04d13daf985d472cc7ff2762ad74d5bb9502
Adam Lesinski [Tue, 30 Jun 2015 23:57:24 +0000 (23:57 +0000)]
am
cce0d46d: am
985d1029: am
fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
* commit '
cce0d46de9c5159b7ca44e27d874b6b87434abc7':
Merge dex2oat with app being installed
Amith Yamasani [Tue, 30 Jun 2015 23:43:33 +0000 (23:43 +0000)]
am
856bc3bd: am
5bfbc07f: am
a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
* commit '
856bc3bd12668730e4672695918f5a8361946320':
Only allow admin users to adopt sd card as internal storage.
Adam Lesinski [Tue, 30 Jun 2015 23:40:59 +0000 (23:40 +0000)]
am
985d1029: am
fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
* commit '
985d10296a87fe3ffeeec18d51f9af8fc96588ed':
Merge dex2oat with app being installed
Adam Lesinski [Tue, 30 Jun 2015 23:30:15 +0000 (23:30 +0000)]
am
fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
* commit '
fba915be162f5e32e1a614c5497ef08b216a5b3a':
Merge dex2oat with app being installed
Amith Yamasani [Tue, 30 Jun 2015 23:26:32 +0000 (23:26 +0000)]
am
5bfbc07f: am
a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
* commit '
5bfbc07fc761009e2b4116d47d6bda7460061840':
Only allow admin users to adopt sd card as internal storage.
Adam Lesinski [Tue, 30 Jun 2015 23:16:18 +0000 (23:16 +0000)]
Merge "Merge dex2oat with app being installed" into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 23:13:51 +0000 (23:13 +0000)]
am
a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
* commit '
a8c4db48c26634836ade77f3f8f0403089245f9c':
Only allow admin users to adopt sd card as internal storage.
Amith Yamasani [Tue, 30 Jun 2015 23:00:27 +0000 (23:00 +0000)]
Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
Jason Monk [Tue, 30 Jun 2015 21:41:31 +0000 (21:41 +0000)]
am
a5dc01a2: am
f1d70b5f: am
a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
* commit '
a5dc01a2b19068280f38cefb22219a3f7375a9c5':
Handle adjust volume user restriction
OSDN Git Service
