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
Maggie Benthall
273155c7d3
UX tweaks for CA cert monitoring
...
- Use a smaller icon on the settings menu in managed device case
- Whitespace/punctuation fix for dialog message string.
Bug: 10421514
Bug: 10785095
Change-Id: Ic7cd0cedd2f7a4075cb9d966265ad40ae002f355
2013-09-20 18:24:52 +00:00
Chong Zhang
3f9df36e7b
am a9d1d90c
: am d8f4eb50
: Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev
...
* commit 'a9d1d90c526e36f495de7f77a299863dc5761ccf':
wifi-display: mark certification strings as not tranlatable
2013-09-20 11:22:25 -07:00
Christopher Tate
1295aeb125
am bc016eec
: am 8243c9a7
: Incorporate home metadata into app details UI
...
* commit 'bc016eec42ee8dd7e959ed40a3201ed126d0e260':
Incorporate home metadata into app details UI
2013-09-20 11:21:01 -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
Christopher Tate
1891b6a304
am 430cb07d
: am 6741d4db
: Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev
...
* commit '430cb07dd79a5534c7bbf301f123f2ee8bd966d8':
Use META_HOME_ALTERNATE for home app uninstall target
2013-09-20 09:58:15 -07: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
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