Jim Miller
2b130d786d
am de105da5: Merge "Change string documentation for widget setting to be more clear." into klp-dev
...
* commit 'de105da5500477d216d226cc342811e335f8bcb4':
Change string documentation for widget setting to be more clear.
2013-09-20 13:06:38 -07:00
Jim Miller
de105da550
Merge "Change string documentation for widget setting to be more clear." into klp-dev
2013-09-20 20:03:52 +00:00
Jim Miller
7c41e5ec10
Change string documentation for widget setting to be more clear.
...
Fixes bug 10505288
Change-Id: I6a375c710b77db845073fffa6ebf15c1cd262900
2013-09-20 13:01:20 -07:00
Chong Zhang
a9d1d90c52
am d8f4eb50: Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev
...
* commit 'd8f4eb50ba8efb4e38c41e00ef1a176b99cdda33':
wifi-display: mark certification strings as not tranlatable
2013-09-20 10:25:49 -07:00
Chong Zhang
d8f4eb50ba
Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev
2013-09-20 17:23:06 +00:00
Chong Zhang
6c0645b954
wifi-display: mark certification strings as not tranlatable
...
Bug: 10507614
Change-Id: I96557f48cb25bc767a3b4c7620a2312417018119
2013-09-19 18:24:32 -07:00
Christopher Tate
bc016eec42
am 8243c9a7: Incorporate home metadata into app details UI
...
* commit '8243c9a722e815bdcb069163de48877478c28dfd':
Incorporate home metadata into app details UI
2013-09-19 17:59:06 -07:00
Christopher Tate
8243c9a722
Incorporate home metadata into app details UI
...
Just as we don't expose disable/uninstall of home applications in this UI,
we now also don't allow disable/uninstall of packages that are proxying
for home apps via the android.app.home.alternate meta-data mechanism.
Also, don't display the 'Home' settings top-level category at all when
there is only a single available home app.
Finally, explicitly note the current user when sending broadcasts,
otherwise API sanity checks get suspicious.
Bug 10749961
Change-Id: I13e11032cb571df19798c4e13c91a572d1ee61a7
2013-09-19 15:39:42 -07:00
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
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
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
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
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
841264618f
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-17 04:15:59 +00: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
07b01304e4
Import translations. DO NOT MERGE
...
Change-Id: Id76027847101f7e17749c6c60863ec213bc6fff9
Auto-generated-cl: translation import
2013-09-16 12:20:03 -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
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
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
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
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
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
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
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
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
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