Amith Yamasani
33b18383d7
am b8e39041
: Merge "Allow space management for device admins" into klp-dev
...
* commit 'b8e39041a5e8994376e44f7b5c5b9cd32a09377e':
Allow space management for device admins
2013-09-13 17:16:09 -07:00
Zhihai Xu
c6c6eb1ff8
am 856df43c
: Merge "MAP 1.1 Review fixes" into klp-dev
...
* commit '856df43c064bea26e467e2305791ce022fe4cf6e':
MAP 1.1 Review fixes
2013-09-13 17:15:13 -07:00
Christopher Tate
aa6bb5eb13
am e238a47f
: Introduce \'Home\' settings
...
* commit 'e238a47f5ea6de128cf76eca8ad2b852cb12f4a0':
Introduce 'Home' settings
2013-09-13 17:14:43 -07:00
Amith Yamasani
b8e39041a5
Merge "Allow space management for device admins" into klp-dev
2013-09-13 23:52:01 +00:00
Elliott Hughes
bca0029436
am 55ea2736
: am 3d83f5ca
: am caeb7a6e
: Merge "Get time zone names from CLDR."
...
* commit '55ea2736f7d2fcaaa64d8db8e8186817def714dd':
Get time zone names from CLDR.
2013-09-13 16:16:26 -07:00
Elliott Hughes
55ea2736f7
am 3d83f5ca
: am caeb7a6e
: Merge "Get time zone names from CLDR."
...
* commit '3d83f5ca9cb39a8f000da4c7f163a25108e1f478':
Get time zone names from CLDR.
2013-09-13 16:14:06 -07:00
Elliott Hughes
3d83f5ca9c
am caeb7a6e
: Merge "Get time zone names from CLDR."
...
* commit 'caeb7a6e627a8326b3268a8ca588b7ea0d3d700c':
Get time zone names from CLDR.
2013-09-13 16:11:43 -07:00
Elliott Hughes
caeb7a6e62
Merge "Get time zone names from CLDR."
2013-09-13 23:08:12 +00:00
Zhihai Xu
856df43c06
Merge "MAP 1.1 Review fixes" into klp-dev
2013-09-13 23:00:36 +00:00
Kim Schulz
5d2595f051
MAP 1.1 Review fixes
...
- Fixes to the issues found during review.
- added support for BluetoothProfile ProfileService Classes
- Added new MapProfile.java to comply with new structure
- changed ORDINAL to use BluetoothProfile.MAP directly
- Moved construction of MapProfile to LocalBluetoothProfileManager constructor
- Added support for multiple concurent permission activities and/or multiple notifications (i.e. pbap and map permission request right after each other)
- cleanup
- changed settings to use Notification.Builder
- made the notifications for map/pbab more informative
- added handling of back button + "clear all notifications"
Bug:10692365
Change-Id: I9803c9658a96b1a9c1d4734d2fdd22f1421d2827
2013-09-13 15:44:26 -07:00
Christopher Tate
e238a47f5e
Introduce 'Home' settings
...
Bug 9958444
Change-Id: I868f5b7aa6ae9273b725cb96e80821a82569e7e0
2013-09-13 12:50:41 -07:00
Amith Yamasani
7f5f0bb2ae
Don't crash on rotation when cropping a profile picture
...
Bug: 8910780
Keep track of pending activity result and avoid deleting the intermediate file.
Change-Id: I56f63e1348c8b1f5229ad3e135016b8b75d3a335
2013-09-13 12:12:08 -07:00
Amith Yamasani
c6fe9cc319
Allow space management for device admins
...
If an active device admin has a space management UI, enable the button
to manage space.
Bug: 10527304
Change-Id: I1d03eec6d766b49b1c3d9bb30151db4cad7e84e8
2013-09-13 10:52:02 -07:00
Martijn Coenen
d2d15687a4
Payments: use latest settings icon.
...
Bug: 10262585
Change-Id: I40e52c67be73f4c434ced755dbc6d340ff709e2a
2013-09-13 11:38:00 +02:00
David Christie
779518ace3
am 2e997350
: am 8b4cdbeb
: Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold sta
...
* commit '2e99735046df7dc016a0407d1806b5979cbfc445':
Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold stay in the list, and apps stay in the list exactly the threshold time after the location request ENDS.
2013-09-12 21:57:38 -07:00
David Christie
2e99735046
am 8b4cdbeb
: Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold stay in the list
...
* commit '8b4cdbebcfb53b57ac2afec1b1e3377d6a02bb21':
Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold stay in the list, and apps stay in the list exactly the threshold time after the location request ENDS.
2013-09-12 21:38:12 -07:00
David Christie
8b4cdbebcf
Fix recent apps in appops.
...
Prior to this fix all apps would disappear from settings->location
15 minutes after the request was first made (even if request
was ongoing). Tested this out - apps requesting location longer
than the threshold stay in the list, and apps stay in the list exactly
the threshold time after the location request ENDS.
Change-Id: I7d4db25c615df2ec41e93b1b3191ba606d26719d
2013-09-12 18:01:28 -07:00
Alan Viverette
32b83d9b1d
am 6489d6f6
: am 54fa990f
: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
...
* commit '6489d6f6547f5eb96d9a675ba68fa241ab699b42':
Fix manifest entry for CAPTIONING_SETTINGS action
2013-09-12 11:29:05 -07:00
Alan Viverette
6489d6f654
am 54fa990f
: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
...
* commit '54fa990f6174542e1e7fbe77a75954fcd2f39983':
Fix manifest entry for CAPTIONING_SETTINGS action
2013-09-12 11:26:22 -07:00
Alan Viverette
54fa990f61
Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
2013-09-12 18:23:34 +00:00
Amith Yamasani
324bdf9329
am 32aa0bfd
: am ad541608
: am ad0f0edb
: Merge "Call to equals() comparing different types"
...
* commit '32aa0bfdd5984970e22da9676c5f59cc0bf9203e':
Call to equals() comparing different types
2013-09-12 10:01:02 -07:00
Amith Yamasani
32aa0bfdd5
am ad541608
: am ad0f0edb
: Merge "Call to equals() comparing different types"
...
* commit 'ad54160844177515dfe9024521669e4b47311d0f':
Call to equals() comparing different types
2013-09-12 09:49:54 -07:00
Baligh Uddin
510ae6b64a
am 3117b930
: (-s ours) am 1ab0933a
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '3117b93015ae35c20613c1647096033fb323395d':
Import translations. DO NOT MERGE
2013-09-12 09:21:58 -07:00
Amith Yamasani
ad54160844
am ad0f0edb
: Merge "Call to equals() comparing different types"
...
* commit 'ad0f0edb54fd61048b64053d7eb8fafa6c84b119':
Call to equals() comparing different types
2013-09-12 09:21:53 -07:00
Baligh Uddin
3117b93015
am 1ab0933a
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '1ab0933a6dbc4cb3df16b90bc730509ed4162721':
Import translations. DO NOT MERGE
2013-09-12 09:12:46 -07:00
Amith Yamasani
ad0f0edb54
Merge "Call to equals() comparing different types"
2013-09-12 16:08:20 +00:00
Baligh Uddin
bf7f933180
Merge "Import translations. DO NOT MERGE"
2013-09-12 03:14:12 +00:00
Baligh Uddin
1ab0933a6d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-12 03:13:57 +00:00
Amith Yamasani
04dcd82e1e
am b57ebd8b
: am 6cd9a67a
: Merge "Increase string lengths for localization." into klp-dev
...
* commit 'b57ebd8bc9e2aed841a881ec79d9b55cee9f0928':
Increase string lengths for localization.
2013-09-11 16:49:16 -07:00
Martijn Coenen
e317b32f8d
am 18c71a91
: am 52df3343
: Merge "HCE: Latest UX and strings." into klp-dev
...
* commit '18c71a91c23523c0b1950397b3c12072c8fecc1f':
HCE: Latest UX and strings.
2013-09-11 16:49:15 -07:00
Baligh Uddin
571d2129ff
Import translations. DO NOT MERGE
...
Change-Id: I97b69c524b4f1894353a0ea1d5851920ca4558b8
Auto-generated-cl: translation import
2013-09-11 15:40:07 -07:00
Baligh Uddin
f2aa7685d0
Import translations. DO NOT MERGE
...
Change-Id: I1cb0e4fdcb057eccc90535d148a38f4149e88419
Auto-generated-cl: translation import
2013-09-11 15:33:39 -07:00
Alan Viverette
9b625f0baa
Fix manifest entry for CAPTIONING_SETTINGS action
...
BUG: 10708261
Change-Id: I54cfd8eaae97ed3da165521b9b4e73924bd3f0e1
2013-09-11 13:03:14 -07:00
Amith Yamasani
b57ebd8bc9
am 6cd9a67a
: Merge "Increase string lengths for localization." into klp-dev
...
* commit '6cd9a67a5463ef97044fa1919b6317276eb8af5f':
Increase string lengths for localization.
2013-09-11 10:58:27 -07:00
Amith Yamasani
6cd9a67a54
Merge "Increase string lengths for localization." into klp-dev
2013-09-11 17:54:53 +00:00
Martijn Coenen
18c71a91c2
am 52df3343
: Merge "HCE: Latest UX and strings." into klp-dev
...
* commit '52df3343ab471b9fcc8773ea7bcb88edb2523896':
HCE: Latest UX and strings.
2013-09-11 10:54:52 -07:00
Martijn Coenen
52df3343ab
Merge "HCE: Latest UX and strings." into klp-dev
2013-09-11 17:52:36 +00:00
Amith Yamasani
a2563d103b
Increase string lengths for localization.
...
Bug: 10287242
Bug: 10282460
Change-Id: Idf867cde3d22446f1a1ce3d4aacbf1d1607a5eb7
2013-09-11 10:19:53 -07:00
Amith Yamasani
140ede5aaf
am e63450d0
: am 37922a16
: Merge "Fix profile picture picking for restricted profiles" into klp-dev
...
* commit 'e63450d02e9617b2d52c8440f18ac60524fecbf4':
Fix profile picture picking for restricted profiles
2013-09-11 10:11:48 -07:00
Amith Yamasani
e63450d02e
am 37922a16
: Merge "Fix profile picture picking for restricted profiles" into klp-dev
...
* commit '37922a16d35526b0a118484c91ce6f8f58c45ce1':
Fix profile picture picking for restricted profiles
2013-09-11 10:06:28 -07:00
Amith Yamasani
37922a16d3
Merge "Fix profile picture picking for restricted profiles" into klp-dev
2013-09-11 17:03:55 +00:00
Martijn Coenen
da6c0ba382
HCE: Latest UX and strings.
...
Bug: 10262585
Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
2013-09-11 12:30:46 +02:00
Amith Yamasani
2ad9625462
Fix profile picture picking for restricted profiles
...
Due to the new file picker UI and incorrect assumptions of access to sd card,
have to use content provider Uris instead of file paths.
Also makes the cropping robust in the event of not having a cropping intent
on the platform.
This should make the code play well with third party image
and camera apps as well.
Bug: 10666584
Change-Id: Ie8d834fe7aac96bc14829a7be084512a15ef4001
2013-09-10 17:16:12 -07:00
Elliott Hughes
f1582bc3f5
Get time zone names from CLDR.
...
Since the intent appears to have been "use the zone's local names if
they're in the same country, and use exemplar locations otherwise",
this patch gets the localized CLDR time zone name or the localized
CLDR exemplar location as appropriate.
Bug: 8145760
Bug: 10179879
Change-Id: Ib3968a493de9f0d3040f3afa6ca07d9f44566a32
2013-09-10 16:46:59 -07:00
David Braun
79c6977e4d
am b6a3133d
: am e9aa0a94
: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
...
* commit 'b6a3133d6ed69279d1776f670b5935010830753c':
Factor out read/write SMS settings seperate from send/receive.
2013-09-10 13:38:13 -07:00
David Braun
b6a3133d6e
am e9aa0a94
: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
...
* commit 'e9aa0a94d0572101dd580bcc48e23b96e6c6cb71':
Factor out read/write SMS settings seperate from send/receive.
2013-09-10 13:35:43 -07:00
David Braun
e9aa0a94d0
Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
2013-09-10 20:33:41 +00:00
David Braun
4f648c2912
Factor out read/write SMS settings seperate from send/receive.
...
Change-Id: I88177c23d165df6c00a8d32203f3a5b18aca1dcf
2013-09-10 13:14:09 -07:00
Przemyslaw Szczepaniak
989adc00dd
am 7d51da80
: am eb306b4c
: Fix for empty "Listen to an example" string.
...
* commit '7d51da8057c38e1fab463410bfcb6239c8c37b4c':
Fix for empty "Listen to an example" string.
2013-09-10 03:20:09 -07:00
Przemyslaw Szczepaniak
7d51da8057
am eb306b4c
: Fix for empty "Listen to an example" string.
...
* commit 'eb306b4c15d721c69255f02497d2bcebff0c265f':
Fix for empty "Listen to an example" string.
2013-09-10 03:19:12 -07:00