Svet Ganov
0a5fa7e410
am cf14b8ba: am 143e118f: Merge "Make grant default permission more robust." into mnc-dev
...
* commit 'cf14b8ba1f86820b6307d65b6fc800d9aa96a6ed':
Make grant default permission more robust.
2015-06-26 23:19:34 +00:00
Svet Ganov
cf14b8ba1f
am 143e118f: Merge "Make grant default permission more robust." into mnc-dev
...
* commit '143e118fa90bbeb8cf558ec0d303639d15ee7db7':
Make grant default permission more robust.
2015-06-26 23:01:45 +00:00
Robert Greenwalt
07fae068d3
am b3fcf1af: am ae3584bd: Merge "Add Validation logging." into mnc-dev
...
* commit 'b3fcf1afcb6856182dea8b7ae128f4232473e35c':
Add Validation logging.
2015-06-26 22:55:03 +00:00
Mady Mellor
51673142ae
am 9ebbbf10: am 11b64410: Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev
...
* commit '9ebbbf107077a7de30491fbaa3b4a2ab9b826775':
Text selection: fix snapping to words when words break across lines
2015-06-26 22:54:57 +00:00
Rubin Xu
ba5c07286f
am d1858a7d: am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
...
* commit 'd1858a7d3e648f6c7382bba5bd3982a7ecc15257':
Use StorageManager.wipeAdoptableDisks to wipe external disks
2015-06-26 22:54:50 +00:00
Abodunrinwa Toki
9508d8738e
am e02ee117: am 1223a75a: Merge "TextView: add the "Share" accessibility action." into mnc-dev
...
* commit 'e02ee117ed14fd76dcbe4ee9d519c15f13d05a9d':
TextView: add the "Share" accessibility action.
2015-06-26 22:54:45 +00:00
Svet Ganov
143e118fa9
Merge "Make grant default permission more robust." into mnc-dev
2015-06-26 22:52:55 +00:00
Robert Greenwalt
b3fcf1afcb
am ae3584bd: Merge "Add Validation logging." into mnc-dev
...
* commit 'ae3584bd8dbbe6c541896f19599596d5a7b6735c':
Add Validation logging.
2015-06-26 22:44:40 +00:00
Mady Mellor
9ebbbf1070
am 11b64410: Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev
...
* commit '11b64410d92a68f10b17190d5566fc2b22875ad5':
Text selection: fix snapping to words when words break across lines
2015-06-26 22:44:36 +00:00
Rubin Xu
d1858a7d3e
am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
...
* commit '0a202eac0103cae1c544d6f44bb67b236a3dde8d':
Use StorageManager.wipeAdoptableDisks to wipe external disks
2015-06-26 22:44:31 +00:00
Abodunrinwa Toki
e02ee117ed
am 1223a75a: Merge "TextView: add the "Share" accessibility action." into mnc-dev
...
* commit '1223a75a672ab249fb966055a98ea2ab807206cf':
TextView: add the "Share" accessibility action.
2015-06-26 22:44:25 +00:00
Svet Ganov
ba3ba81eb8
Make grant default permission more robust.
...
Change-Id: If492ee3305774419671bbdb72b438c8e540005e9
2015-06-26 15:42:49 -07:00
Robert Greenwalt
ae3584bd8d
Merge "Add Validation logging." into mnc-dev
2015-06-26 22:40:31 +00:00
Mady Mellor
11b64410d9
Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev
2015-06-26 22:36:44 +00:00
Rubin Xu
0a202eac01
Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
2015-06-26 22:36:13 +00:00
Abodunrinwa Toki
5d7e2394d3
am 8e1cf18f: am 1fa8290d: Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev
...
* commit '8e1cf18fe7e2cda17813cdc4a8131ef997331958':
Fix FloatingToolbar flicker in reaction to text cursor blink.
2015-06-26 22:33:41 +00:00
Chien-Yu Chen
4997948c7c
am c9a7b419: am f09fd213: Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
...
* commit 'c9a7b41967beaea497fe24d5d1015546697c8d74':
Camera2: Remove references to sync.frameNumber
2015-06-26 22:33:35 +00:00
Chien-Yu Chen
831c12ffd6
am 51e84e7a: am 58a152e3: Merge "Camera2: Clarify session callbacks" into mnc-dev
...
* commit '51e84e7af830135b3cf1f77df79e21fccbf2cc18':
Camera2: Clarify session callbacks
2015-06-26 22:33:29 +00:00
Abodunrinwa Toki
1223a75a67
Merge "TextView: add the "Share" accessibility action." into mnc-dev
2015-06-26 22:32:26 +00:00
Abodunrinwa Toki
8e1cf18fe7
am 1fa8290d: Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev
...
* commit '1fa8290dbec37519576d346ba9ae8bbe20b64aa9':
Fix FloatingToolbar flicker in reaction to text cursor blink.
2015-06-26 22:18:04 +00:00
Chien-Yu Chen
c9a7b41967
am f09fd213: Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
...
* commit 'f09fd213c37f8eef0e6355fee593562474554e68':
Camera2: Remove references to sync.frameNumber
2015-06-26 22:18:00 +00:00
Chien-Yu Chen
51e84e7af8
am 58a152e3: Merge "Camera2: Clarify session callbacks" into mnc-dev
...
* commit '58a152e359c346aba31d887730c84010f132a6ce':
Camera2: Clarify session callbacks
2015-06-26 22:17:55 +00:00
Nathan Harold
f24e9c8dc1
am 140f0398: am aaf280b6: Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev
...
* commit '140f0398ba2ab357838a66088eb4a5f13dc85fdc':
Deprecate TelephonyManager.getNeighboringCellInfo()
2015-06-26 22:17:10 +00:00
Abodunrinwa Toki
1fa8290dbe
Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev
2015-06-26 22:09:43 +00:00
Chien-Yu Chen
f09fd213c3
Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
2015-06-26 22:09:37 +00:00
Abodunrinwa Toki
c107b0ecdc
Fix FloatingToolbar flicker in reaction to text cursor blink.
...
1. Reposition the toolbar on predraw only when positioning has changed.
2. Update the toolbar popup's position only if the content rect changed.
3. Fix FloatingToolbarPopup.cancelOverflowAnimations().
The previous implementation wasn't actually cancelling the animation.
(1) is enough to fix the bug. But (2) and (3) fix issues in the
toolbar directly related to this bug.
Bug: 22039189
Change-Id: I84ec793d788f9402a1f8635e68e3344746f6af07
2015-06-26 15:08:26 -07:00
Chien-Yu Chen
58a152e359
Merge "Camera2: Clarify session callbacks" into mnc-dev
2015-06-26 22:05:05 +00:00
Nathan Harold
140f0398ba
am aaf280b6: Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev
...
* commit 'aaf280b6b17ceaabc0b54fbc8479c14dfb4f6e64':
Deprecate TelephonyManager.getNeighboringCellInfo()
2015-06-26 22:03:13 +00:00
Shirish Kalele
fb94fd2d08
am 18aa304f: am 869c230c: Merge "Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo." into mnc-dev
...
* commit '18aa304fce1f108c3335d8f1339d72f9e4a36e06':
Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo.
2015-06-26 21:54:54 +00:00
Jorim Jaggi
dea3864bca
am b6ab0ca3: am cc3a46ad: Also reset assist setting when force stopping assist
...
* commit 'b6ab0ca3ba59369d45be781d8a1733b60587663d':
Also reset assist setting when force stopping assist
2015-06-26 21:54:48 +00:00
Nathan Harold
aaf280b6b1
Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev
2015-06-26 21:47:21 +00:00
Shirish Kalele
18aa304fce
am 869c230c: Merge "Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo." into mnc-dev
...
* commit '869c230c1466e517289d692dce85acf0c30296c4':
Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo.
2015-06-26 21:40:39 +00:00
Jorim Jaggi
b6ab0ca3ba
am cc3a46ad: Also reset assist setting when force stopping assist
...
* commit 'cc3a46ada84b2c27544df0fa3369631c8dc9386e':
Also reset assist setting when force stopping assist
2015-06-26 21:40:35 +00:00
Mady Mellor
06121b6733
am eb0918f1: am 450176c5: Merge "Fix: Text selection handles shouldn\'t be shown in accessibility mode" into mnc-dev
...
* commit 'eb0918f117bf01e3fb0d52b9b14afea8b0ab9920':
Fix: Text selection handles shouldn't be shown in accessibility mode
2015-06-26 21:39:45 +00:00
Alex Klyubin
4f9f85372c
am c28e5ae1: am e1cf7583: Merge "Don\'t offer crypto ops for public keys of trusted cert entries." into mnc-dev
...
* commit 'c28e5ae13096b390167fbae651eef9fad95c23c0':
Don't offer crypto ops for public keys of trusted cert entries.
2015-06-26 21:39:39 +00:00
George Mount
f337641fa5
am 29711396: am 3ebcd865: Merge "Fix endTransition index out of bounds exception." into mnc-dev
...
* commit '29711396c08aec8cde46f960aa3b3a30d4fde497':
Fix endTransition index out of bounds exception.
2015-06-26 21:39:34 +00:00
George Mount
3c176813a9
am eab5fbc3: am 7a0f54b1: Merge "Fix addTarget not limiting to the given views." into mnc-dev
...
* commit 'eab5fbc390ea331d33a21bcc3622a9fc808586bf':
Fix addTarget not limiting to the given views.
2015-06-26 21:39:28 +00:00
Shirish Kalele
869c230c14
Merge "Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo." into mnc-dev
2015-06-26 21:34:47 +00:00
Jorim Jaggi
cc3a46ada8
Also reset assist setting when force stopping assist
...
Bug: 20882522
Change-Id: I57725586ab5ff203b378a1e6d2e5e77a47fd2448
2015-06-26 21:32:08 +00:00
Mady Mellor
a526683d12
Text selection: fix snapping to words when words break across lines
...
Some languages do break words across lines and words can break between
lines with hyphenation. If a word has only one character on the current
line with the rest of the characters on the next line, the user would
be unable to move the cursor to the end of the word.
Rather than judging if a user is far enough into a word by using the
full word length, this CL amends the logic to only use the characters
that are on the current line of the word, if the user is far enough into
these characters the handle jumps to the next line to the end of the
word position.
Bug: 21400624
Change-Id: I8b96eb83bea08d9794d1e9db74066bcc3e168ac0
2015-06-26 14:28:12 -07:00
Christopher Tate
cba354bfe4
am 5995f059: am 1c3b7a6d: Merge "Use a framework resource to name a factory-default browser app" into mnc-dev
...
* commit '5995f059ae9a99693148c511cc4a83c7aa9adf30':
Use a framework resource to name a factory-default browser app
2015-06-26 21:27:27 +00:00
Jim Miller
7693732cfc
am d3893078: am 63ec93d5: Merge "Have FingerprintService keep the device awake on relevant events." into mnc-dev
...
* commit 'd3893078948efdb70c09495726de4e45cb4f06a3':
Have FingerprintService keep the device awake on relevant events.
2015-06-26 21:27:21 +00:00
Ying Wang
b6b233b9ab
am edb36bf7: am 45f143fe: Merge "Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES" into mnc-dev
...
* commit 'edb36bf73d3d38ca0c6a1227fa9d8cdafb0621d0':
Remove the obsolete LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES
2015-06-26 21:27:17 +00:00
Mady Mellor
eb0918f117
am 450176c5: Merge "Fix: Text selection handles shouldn\'t be shown in accessibility mode" into mnc-dev
...
* commit '450176c52cb42d77764b6cacb7988fa8a6ebfde4':
Fix: Text selection handles shouldn't be shown in accessibility mode
2015-06-26 21:27:14 +00:00
Alex Klyubin
c28e5ae130
am e1cf7583: Merge "Don\'t offer crypto ops for public keys of trusted cert entries." into mnc-dev
...
* commit 'e1cf75833b1a8d19c040af4ecffde3119cc7a855':
Don't offer crypto ops for public keys of trusted cert entries.
2015-06-26 21:27:10 +00:00
George Mount
29711396c0
am 3ebcd865: Merge "Fix endTransition index out of bounds exception." into mnc-dev
...
* commit '3ebcd8654d92da375e7ca6c74b4ba9dc6bb9ec4c':
Fix endTransition index out of bounds exception.
2015-06-26 21:27:06 +00:00
George Mount
eab5fbc390
am 7a0f54b1: Merge "Fix addTarget not limiting to the given views." into mnc-dev
...
* commit '7a0f54b1400c9ca0cb32819dd3a3784f9aa7c351':
Fix addTarget not limiting to the given views.
2015-06-26 21:27:01 +00:00
Abodunrinwa Toki
0e5c603192
TextView: add the "Share" accessibility action.
...
Bug: 21891817
Change-Id: I99b7489845b2103c18fd74d15d0050c34f37ca67
2015-06-26 14:25:15 -07:00
Mady Mellor
450176c52c
Merge "Fix: Text selection handles shouldn't be shown in accessibility mode" into mnc-dev
2015-06-26 21:21:56 +00:00
Alex Klyubin
e1cf75833b
Merge "Don't offer crypto ops for public keys of trusted cert entries." into mnc-dev
2015-06-26 21:20:23 +00:00