Raph Levien
fbe0e8f418
am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev
...
* commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4':
Update hint text color even when text present
2014-11-14 20:56:40 +00:00
Raph Levien
be1ad50b34
am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
...
* commit 'cda81f2ded39b53dd813071760ad235363292d52':
Fudge clipRect in TextView for extra cursor width
2014-11-14 20:56:35 +00:00
Raph Levien
25f7c4b992
Merge "Update hint text color even when text present" into lmp-mr1-dev
2014-11-14 20:53:14 +00:00
Raph Levien
cda81f2ded
Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
2014-11-14 20:51:58 +00:00
Jeff Sharkey
47d2c97e70
am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
...
* commit '27936ad3a677509fab1174c7b6655c894f018143':
Block loading WebView in privileged processes.
2014-11-14 19:33:49 +00:00
Jeff Sharkey
27936ad3a6
Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
2014-11-14 19:24:53 +00:00
Yin-Chia Yeh
46810bf200
am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
...
* commit 'cb6eae0e2eda2a9383ba2682b739b3616a9eaefc':
Camera: doc update for independent 3A
2014-11-14 19:06:37 +00:00
Jeff Sharkey
85844916b8
Block loading WebView in privileged processes.
...
WebView is very powerful, but it also has a large attack area. To
improve security, refuse to load WebView components when running as
the root or system UIDs.
Bug: 18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
2014-11-14 11:02:27 -08:00
Yin-Chia Yeh
cb6eae0e2e
Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
2014-11-14 18:36:33 +00:00
Esteban Talavera
95162ad2ea
am 22dc3b7b: New AccountManager method to copy accounts between users.
...
* commit '22dc3b7ba111e27bce99a7cce966598e7873508c':
New AccountManager method to copy accounts between users.
2014-11-14 11:37:33 +00:00
Esteban Talavera
22dc3b7ba1
New AccountManager method to copy accounts between users.
...
Adding the copyAccountToUser method which copies an account
along with its credentials to a different user.
Also an extra in the public api to identify the account to migrate
during provisioning.
Bug: 17716971
Change-Id: I2f29f1765ba0d360a3894b13ef86253b7c7d3284
2014-11-14 11:09:27 +00:00
Sander Alewijnse
7bec28c5a1
am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
...
* commit 'f39cec0b068abcf306eb91c304ed2eb76e60f8c0':
Add extra to enable device admins to skip removal of system apps.
2014-11-14 10:32:45 +00:00
Sander Alewijnse
f39cec0b06
Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
2014-11-14 10:26:38 +00:00
Alan Viverette
04bea09057
am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
...
* commit '0224d25db2f897ddfc29a722ad91d67dcf2500a9':
Account for window bounds in accessibility view click point computation
2014-11-14 01:51:38 +00:00
Alan Viverette
0224d25db2
Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
2014-11-14 01:46:01 +00:00
Alan Viverette
96dacf3659
am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
...
* commit '24859ba016f740c16113e04271ebe6b3eb61a241':
Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-13 23:53:13 +00:00
ztenghui
9f67155332
am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
...
* commit '475569e98a7d8d42b981df54c70974ad99336328':
Fix the starting pen's position when a path close.
2014-11-13 23:53:03 +00:00
Abhijith Shastry
530f25d629
am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
...
* commit 'fb8db1c84b7fd59f596a6c090a8035fab08ef2f5':
new sms/mms carrier app API
2014-11-13 23:50:12 +00:00
Alan Viverette
24859ba016
Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
2014-11-13 22:45:12 +00:00
ztenghui
475569e98a
Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev
2014-11-13 22:41:55 +00:00
Abhijith Shastry
fb8db1c84b
Merge "new sms/mms carrier app API" into lmp-mr1-dev
2014-11-13 22:15:46 +00:00
Alan Viverette
df68999dc7
Don't dismiss AutoCompleteTextView on focus change while temp detached
...
This is consistent with how TextView handles focus changes while
temporarily detached and prevents the suggestion popup from being
dismissed during layout when the AutoCompleteTextView is used
within a ListView.
BUG: 18364277
Change-Id: I8ca6fb9dba63b49a84a60a606bc441446c083cee
2014-11-13 12:59:37 -08:00
ztenghui
5e7a29f677
Fix the starting pen's position when a path close.
...
We have to cache the starting point for the latest "move", then apply it after
we close the path.
b/18214929
Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
2014-11-13 12:55:16 -08:00
Raph Levien
44cb2432e9
Fudge clipRect in TextView for extra cursor width
...
There are a number of cases (most commonly cursor at start of line in
RTL direction) where the cursor extends past the right edge of the
clipRect. This patch adds approximately 1dp on the right side of the
clip, so that the cursor doesn't get clipped.
Bug: 18035274
Change-Id: I489825a91750742c28e445f54f9d27000accbcfb
2014-11-13 12:48:40 -08:00
Yin-Chia Yeh
7144b5d2cf
Camera: doc update for independent 3A
...
Bug: 18281970
Change-Id: I12f8b4fcbabe473b076464eaf9b7617a5ec586d3
2014-11-13 11:52:45 -08:00
Simranjit Singh Kohli
91b5550ee7
am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
...
* commit 'fdcdb7429e3f150818e8df561a62328444b102c5':
[RemoveAccount API]: Adding support for intent.
2014-11-13 19:24:10 +00:00
Simranjit Singh Kohli
fdcdb7429e
Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
2014-11-13 19:18:30 +00:00
Wale Ogunwale
21f16a475d
am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
...
* commit '28d3c245a1dde4aa5294192bec9980d8a93b0489':
Cancel or drop key events if activity is stopped.
2014-11-13 19:07:19 +00:00
Wale Ogunwale
28d3c245a1
Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
2014-11-13 19:00:07 +00:00
Adam Powell
e2820ed963
am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
...
* commit '87bc2acfd3e874ff94fd3da948c329d2547a2bfc':
Optimize setting padding and backgrounds for views
2014-11-13 18:57:43 +00:00
Sander Alewijnse
8c41156178
Add extra to enable device admins to skip removal of system apps.
...
Bug:17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
2014-11-13 18:16:28 +00:00
Adam Powell
87bc2acfd3
Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
2014-11-13 18:12:54 +00:00
Ignacio Solla
f3bd15cf80
am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
...
* commit 'bf79cbaba915dbbf419e5f59ca1ab258f64c88b4':
[WebView] Allow the WebView to be compiled against the system SDK.
2014-11-13 15:13:06 +00:00
Alexandra Gherghina
fca2575bff
am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
...
* commit '6e33f0fbb57a8afc2184bd9a1798db8bd29e680a':
Add extra for account migration in the DevicePolicyMamager
2014-11-13 15:08:01 +00:00
Narayan Kamath
856a0d06a6
am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
...
* commit 'eed1fba6b54b3305af811b4dd9e367eab01a241b':
Add detailed javadoc for AssetManager.getLocales.
2014-11-13 15:07:51 +00:00
Jeff Brown
4d9bd1516f
am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
...
* commit 'fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff':
Make Message.setAsynchronous() public.
2014-11-13 15:07:46 +00:00
Ignacio Solla
bf79cbaba9
Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
2014-11-13 15:03:45 +00:00
Alexandra Gherghina
6e33f0fbb5
Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895
Add extra for account migration in the DevicePolicyMamager
...
This is in preparation for the implementation CL
Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
2014-11-13 12:46:16 +00:00
Narayan Kamath
eed1fba6b5
Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
2014-11-13 09:33:12 +00:00
Jeff Brown
fef1e0e7f0
Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
2014-11-13 07:11:37 +00:00
Adam Lesinski
648f810647
am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev
...
* commit 'db3d76ab685955aae4a3e363238a2931d89c6f03':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2014-11-13 00:35:58 +00:00
Adam Lesinski
db3d76ab68
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev
2014-11-13 00:33:00 +00:00
Dianne Hackborn
e91ab7f080
am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev
...
* commit '377d80ba53d4eda31d131f4f2bd899668cad426b':
Put native apps above browser in resolver activity.
2014-11-13 00:07:25 +00:00
Dianne Hackborn
377d80ba53
Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev
2014-11-13 00:03:53 +00:00
Cheuksan Wang
f9c50c45c6
new sms/mms carrier app API
...
BUG: 18005911
Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
2014-11-12 15:29:41 -08:00
George Mount
4978ebe04f
am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev
...
* commit 'fa781f8c2cdbd176d8ab8c9c82fcd6496e73e3be':
Update GhostView properly when underlying view changes.
2014-11-12 23:14:55 +00:00
George Mount
fa781f8c2c
Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev
2014-11-12 23:10:35 +00:00
Jeff Sharkey
a2781fdac3
am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates.
...
* commit '521ca5f8fba355f526e82dc3a8fc6520e4379874':
Recover apps with malformed certificates.
2014-11-12 22:54:47 +00:00
Ignacio Solla
451e338c51
[WebView] Allow the WebView to be compiled against the system SDK.
...
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
2014-11-12 22:49:56 +00:00