Christopher Tate
430cb07dd7
am 6741d4db
: Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev
...
* commit '6741d4db7bc385f7c26909d356bf94494e900a46':
Use META_HOME_ALTERNATE for home app uninstall target
2013-09-19 12:48:16 -07:00
Christopher Tate
6741d4db7b
Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev
2013-09-19 19:46:07 +00:00
Baligh Uddin
7cfedbc774
Import translations. DO NOT MERGE
...
Change-Id: Ic72a804da5471d03b12a22e526932195feab9ccf
Auto-generated-cl: translation import
2013-09-19 02:54:26 -07:00
Christopher Tate
1ea5497562
Use META_HOME_ALTERNATE for home app uninstall target
...
So a bundled home app can proxy install/uninstall to a non-bundled
package cleanly.
Bug 10749961
Change-Id: Ia35663fc46c068fe17eafa9116b6dda34c124b04
2013-09-18 18:37:04 -07:00
Elliott Hughes
04487594d7
Fix time zone formatting in RTL locales.
...
This fixes ar, fa, and he/iw.
Bug: 10231161
Change-Id: I31acc044443c026ba8b8e1967810f7aa476bcae7
2013-09-18 15:07:43 -07:00
Baligh Uddin
b0149d7876
am 5cfe03d0
: (-s ours) am 43d8d440
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5cfe03d0e36065abf009974fe952ede2b06ce7c2':
Import translations. DO NOT MERGE
2013-09-18 14:44:32 -07:00
Baligh Uddin
5cfe03d0e3
am 43d8d440
: (-s ours) Import translations. DO NOT MERGE
...
* commit '43d8d440a826692fe5551c06a48318fd0a1092fb':
Import translations. DO NOT MERGE
2013-09-18 14:42:09 -07:00
Baligh Uddin
43d8d440a8
Import translations. DO NOT MERGE
...
Change-Id: I7c84e43d9c5b44e9927994a8e6349666478d399d
Auto-generated-cl: translation import
2013-09-18 14:26:53 -07:00
David Braun
414dca981c
am 9773a014
: am d810a6a5
: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
...
* commit '9773a014003201f9b629ebd69633f7904d909d32':
Implement new method for handling SMS/MMS on the platform
2013-09-17 15:21:42 -07:00
David Braun
9773a01400
am d810a6a5
: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
...
* commit 'd810a6a59a44f9b5bde021dfa0e5507dc4ec0472':
Implement new method for handling SMS/MMS on the platform
2013-09-17 15:19:12 -07:00
David Braun
d810a6a59a
Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
2013-09-17 22:15:13 +00:00
Baligh Uddin
6a1eba23fd
am f73e7284
: (-s ours) am 84126461
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f73e728437629491c61fa9ae6fd5546961005bb9':
Import translations. DO NOT MERGE
2013-09-16 21:20:43 -07:00
Baligh Uddin
f73e728437
am 84126461
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '841264618f0e1f31b33c428ad02ab5babba6a10c':
Import translations. DO NOT MERGE
2013-09-16 21:18:58 -07:00
Baligh Uddin
751a82ea97
Merge "Import translations. DO NOT MERGE"
2013-09-17 04:16:05 +00:00
Baligh Uddin
841264618f
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-17 04:15:59 +00:00
Amith Yamasani
9ff3c424ab
am 8250d33a
: am f48e4b5b
: Merge "Don\'t crash on rotation when cropping a profile picture" into klp-dev
...
* commit '8250d33ad44dc2a39e31337c428311fa2bb08b5a':
Don't crash on rotation when cropping a profile picture
2013-09-16 17:12:25 -07:00
Amith Yamasani
8250d33ad4
am f48e4b5b
: Merge "Don\'t crash on rotation when cropping a profile picture" into klp-dev
...
* commit 'f48e4b5bf628f9422888a97653dd2156489c5352':
Don't crash on rotation when cropping a profile picture
2013-09-16 17:09:46 -07:00
Amith Yamasani
f48e4b5bf6
Merge "Don't crash on rotation when cropping a profile picture" into klp-dev
2013-09-17 00:07:48 +00:00
David Braun
4e9f04de0a
Implement new method for handling SMS/MMS on the platform
...
Multi project change:
The changes in this project update the settings app to support the new
default SMS app setting. I have also updated the order of the wireless
settings in the UX as per request from rachelg.
Bug: 10449618
Change-Id: Iba1ac6ea3f29c2a72af83b122ec5ea3a16a28e58
2013-09-16 13:45:42 -07:00
Baligh Uddin
fa3e8ef399
Import translations. DO NOT MERGE
...
Change-Id: I2ab06cc0b9600edc5489f799ed218eb50408980f
Auto-generated-cl: translation import
2013-09-16 12:25:13 -07:00
Baligh Uddin
07b01304e4
Import translations. DO NOT MERGE
...
Change-Id: Id76027847101f7e17749c6c60863ec213bc6fff9
Auto-generated-cl: translation import
2013-09-16 12:20:03 -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
a18039854d
am cb46e0bc
: (-s ours) am fb9e8646
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cb46e0bcaee9b7110e5dc3402a4d5b127124dad5':
Import translations. DO NOT MERGE
2013-09-14 21:44:45 -07:00
Baligh Uddin
cb46e0bcae
am fb9e8646
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fb9e864626999863065dd0c2d0b1a63e00f9b724':
Import translations. DO NOT MERGE
2013-09-14 21:39:31 -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
Baligh Uddin
f948dab183
am 7b8507f9
: (-s ours) am 119a9ff2
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7b8507f912a90aec7778dfeb2dbac9f3c38da378':
Import translations. DO NOT MERGE
2013-09-14 13:04:26 -07:00
Baligh Uddin
7b8507f912
am 119a9ff2
: (-s ours) Import translations. DO NOT MERGE
...
* commit '119a9ff201551ee5de48aec83b0f472018713bbd':
Import translations. DO NOT MERGE
2013-09-14 13:01:35 -07: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
Amith Yamasani
bb5c3ccecc
am 33b18383
: am b8e39041
: Merge "Allow space management for device admins" into klp-dev
...
* commit '33b18383d7942ce6170d662750ed121a02424c4e':
Allow space management for device admins
2013-09-13 17:22:34 -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