Commit Graph

3709 Commits

Author SHA1 Message Date
Baligh Uddin
fa3e8ef399 Import translations. DO NOT MERGE
Change-Id: I2ab06cc0b9600edc5489f799ed218eb50408980f
Auto-generated-cl: translation import
2013-09-16 12:25:13 -07:00
Martijn Coenen
b6a15c754c am 96d315c7: am 77fbf0c7: Merge "Payments: use latest settings icon." into klp-dev
* commit '96d315c7b7853fd62d6f1b35d040791ac43d5fe7':
  Payments: use latest settings icon.
2013-09-16 03:03:05 -07:00
Martijn Coenen
96d315c7b7 am 77fbf0c7: Merge "Payments: use latest settings icon." into klp-dev
* commit '77fbf0c7a43fff4cf427a31186d1ca8777895205':
  Payments: use latest settings icon.
2013-09-16 03:00:16 -07:00
Martijn Coenen
77fbf0c7a4 Merge "Payments: use latest settings icon." into klp-dev 2013-09-16 09:57:30 +00:00
Svetoslav
16f53d56ff am 882a5b3e: am 256e51d3: Merge "Ignore print service settings activities if they are not exported." into klp-dev
* commit '882a5b3e60c764b9d5acef54e7eba20826760143':
  Ignore print service settings activities if they are not exported.
2013-09-15 17:21:54 -07:00
Svetoslav
882a5b3e60 am 256e51d3: Merge "Ignore print service settings activities if they are not exported." into klp-dev
* commit '256e51d328ac28594a6057de829190ffe4fa593f':
  Ignore print service settings activities if they are not exported.
2013-09-15 17:19:38 -07:00
Svetoslav
256e51d328 Merge "Ignore print service settings activities if they are not exported." into klp-dev 2013-09-16 00:16:56 +00:00
Dianne Hackborn
da54bba5bb am 18d6e016: am 2d29fad1: Merge "Various proc stats UI improvements." into klp-dev
* commit '18d6e0164c4f1eccfce5fab064d84dec3bc6c745':
  Various proc stats UI improvements.
2013-09-15 17:08:05 -07:00
Dianne Hackborn
18d6e0164c am 2d29fad1: Merge "Various proc stats UI improvements." into klp-dev
* commit '2d29fad197c1fe17e5a61fb30944c5add989e7f1':
  Various proc stats UI improvements.
2013-09-15 17:05:56 -07:00
Dianne Hackborn
2d29fad197 Merge "Various proc stats UI improvements." into klp-dev 2013-09-16 00:04:51 +00:00
Dianne Hackborn
49759af6b0 Various proc stats UI improvements.
- Option to include system processes.
- Option to use uss instead of pss sizes.
- Option to select type of stats: background processes, foreground (top)
  processes, cached processes.
- Details now shows max mem usage.

Change-Id: Ic994564ce846bc1021bf35576feeb9ef095b0e48
2013-09-15 13:22:28 -07:00
Mindy Pereira
16b56fd1e2 am ae6067c4: am 8104ac0c: Merge "Update the action bar in settings." into klp-dev
* commit 'ae6067c4bd9e86ed8f4b48ec8c266c7d0caa822a':
  Update the action bar in settings.
2013-09-15 11:02:49 -07:00
Mindy Pereira
ae6067c4bd am 8104ac0c: Merge "Update the action bar in settings." into klp-dev
* commit '8104ac0c5135508cad8e203ad1936a0c08d555a9':
  Update the action bar in settings.
2013-09-15 11:01:29 -07:00
Mindy Pereira
8104ac0c51 Merge "Update the action bar in settings." into klp-dev 2013-09-15 17:59:11 +00:00
Svetoslav
17e72aa90b Ignore print service settings activities if they are not exported.
1. The print spooler cannot start not exported activities and they
   should not be started from another application anyway. Therefore,
   we do not start them from settings too even though settings can
   do that since it is signed with the platform certificate.

2. Adding some string changes to meet the translation deadline.

bug:10680224

Change-Id: I69c189e1c502985aceb68d269492f2e86de44ec4
2013-09-15 03:00:54 -07:00
Baligh Uddin
fb9e864626 Import translations. DO NOT MERGE
Change-Id: I13c51ef2316f477f02ec447afcd63f036e89ab6f
Auto-generated-cl: translation import
2013-09-14 21:12:30 -07:00
Maggie Benthall
fa2b5ca1c0 am ff8af60a: am 189dab3d: Merge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev
* commit 'ff8af60a9c3098509939b579bf1c0b2cd09d4666':
  Activity for messaging installed CA certs, and icon in Settings.
2013-09-14 14:25:02 -07:00
Maggie Benthall
ff8af60a9c am 189dab3d: Merge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev
* commit '189dab3d41312b6404f2121d54580ee2c5b9df8e':
  Activity for messaging installed CA certs, and icon in Settings.
2013-09-14 14:22:26 -07:00
Maggie Benthall
189dab3d41 Merge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev 2013-09-14 21:20:05 +00:00
Maggie Benthall
9d6c40e56d Activity for messaging installed CA certs, and icon in Settings.
Add the MonitoringCertInfoActivity, used by Settings, QuickSettings
and notification to explain about CA certs enabling network traffic
monitoring.
Add a button on the Security item in Settings when a cert is installed.

Bug: 10633199

Change-Id: Ic753fe22b66c30d837a9ba471a0632a07bb7471f
2013-09-14 15:02:51 -04:00
Baligh Uddin
35d41d298d Import translations. DO NOT MERGE
Change-Id: Ice787280e8cc2b476e3ad7e002f3a9c07fac15fc
Auto-generated-cl: translation import
2013-09-14 00:15:31 -07:00
Baligh Uddin
119a9ff201 Import translations. DO NOT MERGE
Change-Id: I09a3ac5d24a12b066fb961e686753b1e3677b73d
Auto-generated-cl: translation import
2013-09-14 00:11:44 -07:00
Mindy Pereira
d977140a4c Update the action bar in settings.
Change-Id: I7236636c3b5440c9811cb452a082e6e3dd72bb58
2013-09-13 20:23:28 -07:00
Zhihai Xu
5037580704 am c6c6eb1f: am 856df43c: Merge "MAP 1.1 Review fixes" into klp-dev
* commit 'c6c6eb1ff84d64b90299787bd4af935b7dac8b64':
  MAP 1.1 Review fixes
2013-09-13 17:22:33 -07:00
Christopher Tate
8a3a3449c6 am aa6bb5eb: am e238a47f: Introduce \'Home\' settings
* commit 'aa6bb5eb135a461d4215e7ee3d659acaac1b68bb':
  Introduce 'Home' settings
2013-09-13 17:22:32 -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
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
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
Martijn Coenen
d2d15687a4 Payments: use latest settings icon.
Bug: 10262585
Change-Id: I40e52c67be73f4c434ced755dbc6d340ff709e2a
2013-09-13 11:38:00 +02: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
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