Lifu Tang
1950047a32
am c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors"" into klp-dev
...
* commit 'c9ebf9bbad2eec84a68799a71a229d3198b49c73':
Change "Device sensors only" to "Device sensors"
2013-09-20 17:12:11 -07:00
Lifu Tang
c9ebf9bbad
Merge "Change "Device sensors only" to "Device sensors"" into klp-dev
2013-09-21 00:10:11 +00:00
Lifu Tang
db4ee54975
Change "Device sensors only" to "Device sensors"
...
- Fix b/10856635
Change-Id: I52ef1daacc205c50056fcead0e6b07c8674275f0
2013-09-20 16:57:18 -07:00
David Braun
41b18f71b2
am 1a2bfad4: Merge "Fix crash rotating with default SMS dialog up." into klp-dev
...
* commit '1a2bfad4250cb231d60823affbb8288b6c6d1797':
Fix crash rotating with default SMS dialog up.
2013-09-20 16:31:23 -07:00
David Braun
1a2bfad425
Merge "Fix crash rotating with default SMS dialog up." into klp-dev
2013-09-20 23:29:41 +00:00
David Braun
be1f0a111e
Fix crash rotating with default SMS dialog up.
...
Bug: 10845396 NPE storage == null when user rotates device while setting up 'Default SMS app'
Change-Id: I9a19ede726caabe5e66b83951585380768b66be6
2013-09-20 14:15:32 -07:00
Elliott Hughes
b3bc933716
am aeb1fa77: am 10fdcab4: Merge "Fix time zone formatting in RTL locales."
...
* commit 'aeb1fa779ba781fc1decb68db387ee64df58befa':
Fix time zone formatting in RTL locales.
2013-09-20 13:47:58 -07:00
Elliott Hughes
aeb1fa779b
am 10fdcab4: Merge "Fix time zone formatting in RTL locales."
...
* commit '10fdcab4245ce1beeb75c36b36ccaa48bf8953f0':
Fix time zone formatting in RTL locales.
2013-09-20 13:46:04 -07:00
Elliott Hughes
10fdcab424
Merge "Fix time zone formatting in RTL locales."
2013-09-20 20:44:32 +00:00
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
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
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
Baligh Uddin
71b45ed9ea
Import translations. DO NOT MERGE
...
Change-Id: I3484761b4a6e218c8e7c6d164e864b60d1c37fed
Auto-generated-cl: translation import
2013-09-19 12:27:19 -07:00
The Android Automerger
2a48bb2120
merge in klp-factoryrom-release history after reset to klp-dev
2013-09-19 12:14:21 -07:00
The Android Automerger
597c0d3217
merge in klp-release history after reset to klp-dev
2013-09-19 06:02:19 -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
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
66af29db4e
Import translations. DO NOT MERGE
...
Change-Id: I3484761b4a6e218c8e7c6d164e864b60d1c37fed
Auto-generated-cl: translation import
2013-09-18 14:39:40 -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
The Android Automerger
5ffaf2feac
merge in klp-release history after reset to klp-dev
2013-09-17 21:11:52 -07:00
The Android Automerger
a1bde650d9
merge in klp-release history after reset to klp-dev
2013-09-17 17:40:01 -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
The Android Automerger
2de0d31f54
merge in klp-release history after reset to klp-dev
2013-09-17 06:01:30 -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
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
The Android Automerger
539c258980
merge in klp-factoryrom-release history after reset to klp-release
2013-09-16 11:06:49 -07:00
The Android Automerger
23c12979bc
merge in klp-release history after reset to klp-dev
2013-09-16 06:02:17 -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