Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,016 Commits 3 Branches 0 Tags
c8b2adf26956e4fdfd2ba46e53b8a385622f26b4
Commit Graph

50341 Commits

Author SHA1 Message Date
Alan Viverette
cf3a3e1272 am 1537e135: am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 
* commit '1537e1358ea8446a1a512f1a15244355acda6d1a':
  Always remeasure ListView scrap used to obtain minimum width
 2015-06-29 20:17:49 +00:00
Alan Viverette
1537e1358e am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 
* commit '4faa4cbbca0c9027aa67063a2ad43f008628c5bb':
  Always remeasure ListView scrap used to obtain minimum width
 2015-06-29 20:04:39 +00:00
Alan Viverette
a1b647c883 Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 2015-06-29 19:39:29 +00:00
Nicolas Prevot
2f37bd3921 am d1d1a700: am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 
* commit 'd1d1a700501242cca06b5729c2bd888d6f2d4d52':
  Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
 2015-06-29 17:41:26 +00:00
Kenny Guy
516dfbe39f am 45dab52c: am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '45dab52ce84b4ecc6461260a28f1a8f72158be9f':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 17:26:01 +00:00
Craig Lafayette
6cdad1244d am 8a42356c: am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '8a42356c21435ee502efc925f70389a0c0024118':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 17:25:53 +00:00
Kenny Guy
0c5877f07b am 24863e12: am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '24863e12e51ecf3acb395f0036bbed8b27e23978':
  Deprecate APIs for admin to create users.
 2015-06-29 17:25:46 +00:00
Nicolas Prevot
d1d1a70050 am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 
* commit '64c0c4da555f6d38b9c2516f855b49e6b501b783':
  Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
 2015-06-29 17:25:10 +00:00
Nicolas Prevot
6fd49936ae Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 2015-06-29 17:08:34 +00:00
Benjamin Franz
94a20a2efd resolved conflicts for merge of 31706d99 to master 
Change-Id: Ic3acad0d2d82ff8f0e5d31d3490c009d242d860b
 2015-06-29 17:39:31 +01:00
Kenny Guy
45dab52ce8 am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '9aa0c4811097e7754cde0340dfcc32044a7caf7d':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 13:58:13 +00:00
Craig Lafayette
8a42356c21 am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '5c708248c32f1a667ea3d49cf6ace28b5d29afd1':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 13:57:56 +00:00
Kenny Guy
24863e12e5 am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '2c594b214977221773b447bd4cfefb5187911f10':
  Deprecate APIs for admin to create users.
 2015-06-29 13:57:50 +00:00
Benjamin Franz
31706d9921 am 635e4ffc: am b6fb3fe8: Merge "Block assist when screenshots are disabled by policy" into mnc-dev 
* commit '635e4ffcf65bef9cde34a62583ee6dac49cb2592':
  Block assist when screenshots are disabled by policy
 2015-06-29 13:57:33 +00:00
Kenny Guy
43904fd5b7 Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11 Revert "Deprecate APIs for admin to create users." 
This reverts commit ea864c4d4d.

Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
 2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69 Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662 Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-29 12:42:21 +00:00
Benjamin Franz
b6fb3fe8f4 Merge "Block assist when screenshots are disabled by policy" into mnc-dev 2015-06-29 10:29:23 +00:00
Niels Egberts
9c51187219 am 994d33c4: am 5cf3d76e: am 1ea7a819: Merge "Fix crash with engines that don\'t override getVoices()." into mnc-dev 
* commit '994d33c4bef8bb2e668694cfc95f327f5332995f':
  Fix crash with engines that don't override getVoices().
 2015-06-29 10:06:57 +00:00
Niels Egberts
994d33c4be am 5cf3d76e: am 1ea7a819: Merge "Fix crash with engines that don\'t override getVoices()." into mnc-dev 
* commit '5cf3d76e98172f8bf2fc02fa5dbf028c07747c60':
  Fix crash with engines that don't override getVoices().
 2015-06-29 09:56:35 +00:00
Niels Egberts
1ea7a81931 Merge "Fix crash with engines that don't override getVoices()." into mnc-dev 2015-06-29 09:34:44 +00:00
Seigo Nonaka
b1efe967ba am 45034326: am a7c725f2: am e96b1c6f: Merge "Fix crash due to reverse selection." into mnc-dev 
* commit '450343261eaed2c5f5c83ed7ea31d570cf73569b':
  Fix crash due to reverse selection.
 2015-06-29 03:36:46 +00:00
Seigo Nonaka
450343261e am a7c725f2: am e96b1c6f: Merge "Fix crash due to reverse selection." into mnc-dev 
* commit 'a7c725f2f3e3b7df1923033555a845bfb6a936f9':
  Fix crash due to reverse selection.
 2015-06-29 03:25:19 +00:00
Seigo Nonaka
e96b1c6f82 Merge "Fix crash due to reverse selection." into mnc-dev 2015-06-29 03:02:45 +00:00
Christopher Tate
7257462a73 am de3d02e4: am e436e19e: am b035c6d9: Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev 
* commit 'de3d02e4c3057c8ab7e40c0592dc2e94f0b42e64':
  Properly scope the "only http/https schemes" intent filter semantics
 2015-06-27 01:21:11 +00:00
Dianne Hackborn
21002cf256 am c063f1cf: am 97abd672: am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev 
* commit 'c063f1cf50c4f4b015c763af8476a25a0df7f45b':
  Looks like MNC is gonna be API 23.
 2015-06-27 01:07:16 +00:00
Christopher Tate
de3d02e4c3 am e436e19e: am b035c6d9: Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev 
* commit 'e436e19e0f40defcac3265efcc40eb355de06846':
  Properly scope the "only http/https schemes" intent filter semantics
 2015-06-27 01:05:16 +00:00
Dianne Hackborn
c063f1cf50 am 97abd672: am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev 
* commit '97abd672aaa041c34542d8bbededbe207798baee':
  Looks like MNC is gonna be API 23.
 2015-06-27 00:54:25 +00:00
Christopher Tate
b035c6d9a6 Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev 2015-06-27 00:48:10 +00:00
Christopher Tate
2134744efd Properly scope the "only http/https schemes" intent filter semantics 
That restriction applies only to default-app linkage verification, and
not to any general questions of "is this app effectively a web browser?"

Bug 21688029

Change-Id: I9f6a7bc6dcac5e12ee07f8da6465ad51c1aeddfb
 2015-06-26 17:45:22 -07:00
Dianne Hackborn
d5f387bc5f Merge "Looks like MNC is gonna be API 23." into mnc-dev 2015-06-27 00:29:26 +00:00
Dianne Hackborn
2e5cad7868 Looks like MNC is gonna be API 23. 
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
 2015-06-26 16:15:55 -07:00
Robert Greenwalt
d99956ee08 am 07fae068: am b3fcf1af: am ae3584bd: Merge "Add Validation logging." into mnc-dev 
* commit '07fae068d3edc7b265f47c8340dfa105064c09fc':
  Add Validation logging.
 2015-06-26 23:13:15 +00:00
Mady Mellor
71a09ccfc4 am 51673142: am 9ebbbf10: am 11b64410: Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev 
* commit '51673142ae8c42bc19c57e57ccf50263534c8b11':
  Text selection: fix snapping to words when words break across lines
 2015-06-26 23:13:08 +00:00
Rubin Xu
ab446232be am ba5c0728: am d1858a7d: am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 
* commit 'ba5c07286f9980220bda4ed6e9e29f392669c05c':
  Use StorageManager.wipeAdoptableDisks to wipe external disks
 2015-06-26 23:13:01 +00:00
Abodunrinwa Toki
e1f7577870 am 9508d873: am e02ee117: am 1223a75a: Merge "TextView: add the "Share" accessibility action." into mnc-dev 
* commit '9508d8738e2f7b16b8f6fdc8ce49d9708374840f':
  TextView: add the "Share" accessibility action.
 2015-06-26 23:12:55 +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
Chien-Yu Chen
a80f7e60ab am 4997948c: am c9a7b419: am f09fd213: Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev 
* commit '4997948c7c8dfcc8a6c4b1af1eda078d72363c92':
  Camera2: Remove references to sync.frameNumber
 2015-06-26 22:46:40 +00:00
Chien-Yu Chen
be108a7d81 am 831c12ff: am 51e84e7a: am 58a152e3: Merge "Camera2: Clarify session callbacks" into mnc-dev 
* commit '831c12ffd6d71f16c49267f3f9ec7c3e529d8049':
  Camera2: Clarify session callbacks
 2015-06-26 22:46:33 +00: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
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
Chien-Yu Chen
f09fd213c3 Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev 2015-06-26 22:09:37 +00:00