Ed Heyl
cfa55e164b
merge in KQS81M
2013-10-08 15:43:09 -07:00
Alan Viverette
954fd32047
Fix caption settings picker layouts
...
BUG: 11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd
2013-10-08 15:33:00 -07:00
Svetoslav
372cd6ab86
am d9649d4e
: am 31962228
: Merge "Fix a crash in the print service settigns." into klp-dev
...
* commit 'd9649d4e150130eef78a04c684007fe729f3206a':
Fix a crash in the print service settigns.
2013-10-08 14:35:18 -07:00
Svetoslav
d9649d4e15
am 31962228
: Merge "Fix a crash in the print service settigns." into klp-dev
...
* commit '31962228aa0230272950e88cf635f0576e0bad67':
Fix a crash in the print service settigns.
2013-10-08 14:32:20 -07:00
Svetoslav
31962228aa
Merge "Fix a crash in the print service settigns." into klp-dev
2013-10-08 21:28:22 +00:00
Christopher Tate
7e776ad76c
am 3eb0f422
: am eff0927d
: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
...
* commit '3eb0f422f6e0291a274f72dc3951ce7cf048e5be':
Once we decide to show Home settings, keep it shown forever
2013-10-08 14:26:16 -07:00
Christopher Tate
3eb0f422f6
am eff0927d
: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
...
* commit 'eff0927df2515662a263fb79a5a060d81273a36b':
Once we decide to show Home settings, keep it shown forever
2013-10-08 14:23:22 -07:00
Christopher Tate
eff0927df2
Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
2013-10-08 21:20:13 +00:00
Svetoslav
39392ef9b0
Fix a crash in the print service settigns.
...
When the search view is attached and detached we announce that
for accessibility. The trouble is that if the activity is being
torn down we are trying to access resources from a fragment that
is detached and the qcrash occurs. This change does not try to
access resources if the activity is finishing and also we do not
load resource strings if accessibility is not enabled.
bug:11127814
Change-Id: If3e97b6e94687775386a43c8fa54fd45140306eb
2013-10-08 12:08:18 -07:00
Lifu Tang
c936b9c822
am 83df0123
: am 40eefc17
: am 1673fbc0
: Broadcasting a message for mode changing
...
* commit '83df01235788b2a820d68b7c8a51f7a0fc5c1d64':
Broadcasting a message for mode changing
2013-10-08 12:01:45 -07:00
Lifu Tang
83df012357
am 40eefc17
: am 1673fbc0
: Broadcasting a message for mode changing
...
* commit '40eefc17d877357e074fff34c670b6e61f71deeb':
Broadcasting a message for mode changing
2013-10-08 11:58:44 -07:00
Lifu Tang
40eefc17d8
am 1673fbc0
: Broadcasting a message for mode changing
...
* commit '1673fbc029d569b6424914db48e571b52091b4fc':
Broadcasting a message for mode changing
2013-10-08 11:53:27 -07:00
Christopher Tate
dc7be10734
Once we decide to show Home settings, keep it shown forever
...
Principle of Least Surprise FTW.
Bug 11131794
Change-Id: I1df720fa86fb870aa74a5d0074ca966843317f12
2013-10-08 11:33:03 -07:00
Yuhao Zheng
6271cd01de
Fix NPE in Wi-Fi Direct Setting UI
...
After a PreferenceGroup is created, attach it to a PreferenceScreen right away.
Otherwise, if PreferenceGroup.addPreference is accidentally called before being
attached, it will result in an NPE and a UI crash.
Bug: 11050625
Change-Id: I68fa8b67ab807c0729c43c1b5cdabdbcd4f2c230
2013-10-08 10:26:37 -07:00
Lifu Tang
1673fbc029
Broadcasting a message for mode changing
...
- Fix b/10974059
Change-Id: I219ea35e65a36af9f041a487dd8039bb5e2f048b
2013-10-08 09:48:41 -07:00
The Android Automerger
723c5598d9
merge in klp-release history after reset to klp-dev
2013-10-08 06:01:34 -07:00
Baligh Uddin
30d46a60d7
am 9e442523
: (-s ours) am 6b590746
: (-s ours) am 1955bf1b
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '9e4425231efc19997f69376927ab8ef4c0ff0f7a':
Import translations. DO NOT MERGE
2013-10-07 20:59:58 -07:00
Baligh Uddin
9e4425231e
am 6b590746
: (-s ours) am 1955bf1b
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '6b590746dfdb3f721dab048a1978a5630da9e5eb':
Import translations. DO NOT MERGE
2013-10-07 20:54:41 -07:00
Baligh Uddin
0bea2625dd
am 0e124560
: (-s ours) am ebaa7509
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit '0e124560e6d4c6c87f1a87ec7cecca3e35b741a1':
Import translations. DO NOT MERGE
2013-10-07 20:52:44 -07:00
Baligh Uddin
6b590746df
am 1955bf1b
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '1955bf1bb3147a06d1856ac002f8cd5aab4f535e':
Import translations. DO NOT MERGE
2013-10-07 20:51:30 -07:00
Baligh Uddin
0e124560e6
am ebaa7509
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit 'ebaa7509edda445e1d809b331d9ecc848fe19773':
Import translations. DO NOT MERGE
2013-10-07 20:51:06 -07:00
Baligh Uddin
ab0f5ae4e3
Merge "Import translations. DO NOT MERGE"
2013-10-08 03:49:39 +00:00
Baligh Uddin
ebaa7509ed
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-08 03:49:34 +00:00
Baligh Uddin
1955bf1bb3
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-08 03:49:14 +00:00
Baligh Uddin
5faedbfb72
Import translations. DO NOT MERGE
...
Change-Id: Ia0bfc7802cee3463b0ea003fa23a41ac948065cf
Auto-generated-cl: translation import
2013-10-07 19:06:16 -07:00
Baligh Uddin
b49c9a49d5
Import translations. DO NOT MERGE
...
Change-Id: If370e7dc3d5de024ec3a6afd037019226fe45569
Auto-generated-cl: translation import
2013-10-07 19:02:02 -07:00
Baligh Uddin
275f7679d0
Import translations. DO NOT MERGE
...
Change-Id: I8cdb9b939a3985f7eb7813fa0bfbc3129ca8638d
Auto-generated-cl: translation import
2013-10-07 18:55:29 -07:00
Chris Wren
cff5cca476
am 65994536
: am 98b30cea
: am a50f7851
: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
...
* commit '659945365d83bd30de5a506e9504687217393db8':
Hide Camera in CryptKeeperConfirm
2013-10-07 13:12:23 -07:00
Chris Wren
659945365d
am 98b30cea
: am a50f7851
: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
...
* commit '98b30ceaa2ef049f41907ea9672bb5f028472f1c':
Hide Camera in CryptKeeperConfirm
2013-10-07 13:09:39 -07:00
Chris Wren
98b30ceaa2
am a50f7851
: Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
...
* commit 'a50f78515e2718fa5e47f283e25705806bd163aa':
Hide Camera in CryptKeeperConfirm
2013-10-07 13:06:45 -07:00
Chris Wren
a50f78515e
Merge "Hide Camera in CryptKeeperConfirm" into klp-dev
2013-10-07 20:01:35 +00:00
David Braun
af1bf89528
am 1c2a3ad6
: am a633e1d5
: am 1c17255d
: Block "SMS Default Dialog" on non-phone devices
...
* commit '1c2a3ad6cb262447ebed557c6b1bf36bab11d59e':
Block "SMS Default Dialog" on non-phone devices
2013-10-07 11:18:09 -07:00
David Braun
1c2a3ad6cb
am a633e1d5
: am 1c17255d
: Block "SMS Default Dialog" on non-phone devices
...
* commit 'a633e1d54d28d5c646b1f99df62a9250e48340ce':
Block "SMS Default Dialog" on non-phone devices
2013-10-07 11:15:39 -07:00
David Braun
a633e1d54d
am 1c17255d
: Block "SMS Default Dialog" on non-phone devices
...
* commit '1c17255d5edadaf1790af365d2ed5f962a7bcc65':
Block "SMS Default Dialog" on non-phone devices
2013-10-07 11:13:22 -07:00
David Braun
1c17255d5e
Block "SMS Default Dialog" on non-phone devices
...
This change also handles the case where getDefaultSmsApplication returns
null more elegantly, though this is only really possible on a device that
is a tablet (blocked earlier in the method) or a phone device that had no
SMS apps at boot (when we force the setting of an SMS app.)
Bug: 11072894 People app should not launch into default SMS app on tablets
Change-Id: I1e253873e053c21bc1652bd03d7b486aaf9be5e1
2013-10-07 09:35:52 -07:00
Chris Wren
0481dc7172
Hide Camera in CryptKeeperConfirm
...
Bug: 10900437
Change-Id: Ie9bbe3bacba6fb37ddd6c2753e011dc7abb63c77
2013-10-07 01:11:08 -04:00
Robert Greenwalt
21a2eb5aea
Add batch scan data to power stats.
...
bug:10690989
Change-Id: I5c21b8234eb1dec2da01032a87e2129b5b5cb225
2013-10-06 13:35:23 -07:00
The Android Automerger
49306d6e1d
merge in klp-release history after reset to klp-dev
2013-10-06 06:02:07 -07:00
Baligh Uddin
ee63519d2a
am 2abb3443
: (-s ours) am 040cfe56
: (-s ours) am 8aecb7ce
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2abb3443170885bc41ccfaa903796f6435b10839':
Import translations. DO NOT MERGE
2013-10-05 09:40:53 -07:00
Baligh Uddin
2abb344317
am 040cfe56
: (-s ours) am 8aecb7ce
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '040cfe56112326d470a58b2f55642a234ff3fce2':
Import translations. DO NOT MERGE
2013-10-05 09:37:01 -07:00
Baligh Uddin
493324ebae
am 5318a0d3
: (-s ours) am 249100c1
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit '5318a0d3059c65f51464c7110e34d4f5a33de7be':
Import translations. DO NOT MERGE
2013-10-04 20:42:22 -07:00
Baligh Uddin
040cfe5611
am 8aecb7ce
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8aecb7cea083366fc85d8088d7e5e18e775fee80':
Import translations. DO NOT MERGE
2013-10-04 20:41:16 -07:00
Baligh Uddin
5318a0d305
am 249100c1
: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
...
* commit '249100c1151569a9e903489b2f496446f740cc29':
Import translations. DO NOT MERGE
2013-10-04 20:40:32 -07:00
Baligh Uddin
03da98f21f
Merge "Import translations. DO NOT MERGE"
2013-10-05 03:38:22 +00:00
Baligh Uddin
249100c115
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-05 03:38:17 +00:00
Baligh Uddin
8aecb7cea0
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-05 03:37:55 +00:00
Baligh Uddin
39529d4672
Import translations. DO NOT MERGE
...
Change-Id: I6b8001b3f2fcb88b547b79b020472fa62d2e70c9
Auto-generated-cl: translation import
2013-10-04 18:48:30 -07:00
Baligh Uddin
f604cd9842
Import translations. DO NOT MERGE
...
Change-Id: I6da7d93122a4b4b00a05fbabb5170b935610dfc2
Auto-generated-cl: translation import
2013-10-04 18:44:36 -07:00
Baligh Uddin
f2b4a7dd37
Import translations. DO NOT MERGE
...
Change-Id: I97e1bf2ace031bcf591507987bd5d6ae9c6160fd
Auto-generated-cl: translation import
2013-10-04 18:40:44 -07:00
Svetoslav
4b23800471
am ef1cfe16
: am 32d7ea74
: am 9379d935
: Make printers for a print service not react to press.
...
* commit 'ef1cfe16fb95a8ae0e73dbd8d2f4235386be1803':
Make printers for a print service not react to press.
2013-10-04 18:08:26 -07:00